aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock49
-rw-r--r--flake.nix4
-rw-r--r--gui/rofi.nix51
3 files changed, 47 insertions, 57 deletions
diff --git a/flake.lock b/flake.lock
index 70a3248..a06d2f9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"emacs": {
"locked": {
- "lastModified": 1638785903,
- "narHash": "sha256-Fdcppk+4AIZilRpbSCVPWuDy1/GbV64Slyahf5XR4J4=",
+ "lastModified": 1640688616,
+ "narHash": "sha256-m/dTZ/rJcZijJHaZ4LBPwZtP9WX0dyDwoGScBP5ngfY=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "d266fd6e14cde2a2aa17fd821dd1e7ca6b62f012",
+ "rev": "fc51b697d20a4c7ad3ee296491f7468f6478dda1",
"type": "github"
},
"original": {
@@ -38,16 +38,16 @@
]
},
"locked": {
- "lastModified": 1634544068,
- "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
+ "lastModified": 1639871969,
+ "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
+ "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-21.05",
+ "ref": "release-21.11",
"repo": "home-manager",
"type": "github"
}
@@ -55,9 +55,7 @@
"jupyter": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": [
- "stable"
- ]
+ "nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1628121465,
@@ -76,6 +74,21 @@
},
"nixpkgs": {
"locked": {
+ "lastModified": 1623393771,
+ "narHash": "sha256-UMqgWzS0IEqsosffjL0P621dixn5ncE9unNylpUB9Zs=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "a5d03577f0161c8a6e713b928ca44d9b3feb2c37",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "rev": "a5d03577f0161c8a6e713b928ca44d9b3feb2c37",
+ "type": "indirect"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
"lastModified": 1629271619,
"narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=",
"owner": "NixOS",
@@ -92,7 +105,7 @@
},
"personal": {
"inputs": {
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1629367653,
@@ -120,27 +133,27 @@
},
"stable": {
"locked": {
- "lastModified": 1638564543,
- "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
+ "lastModified": 1640572776,
+ "narHash": "sha256-pWMTubBy1Ep31iuQ5lEKW2mjSHWEvcbvy9uHVch2764=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
+ "rev": "d887ac7aee92e8fc54dde9060d60d927afae9d69",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-21.05",
+ "ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"unstable": {
"locked": {
- "lastModified": 1638761670,
- "narHash": "sha256-LywnGCbjfMHp4lwAmIXozB/rAqPkCG0J8HhMPwXsR1U=",
+ "lastModified": 1640418986,
+ "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "02336c5c5f719cd6bd4cfc5a091a1ccee6f06b1d",
+ "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 9861ee7..5f519ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
description = "Computing environment of Adrian Kummerlaender";
inputs = {
- stable.url = github:NixOS/nixpkgs/nixos-21.05;
+ stable.url = github:NixOS/nixpkgs/nixos-21.11;
unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable;
personal.url = github:KnairdA/pkgs;
home-manager = {
- url = github:nix-community/home-manager/release-21.05;
+ url = github:nix-community/home-manager/release-21.11;
inputs = { nixpkgs.follows = "stable"; };
};
emacs.url = github:nix-community/emacs-overlay/master;
diff --git a/gui/rofi.nix b/gui/rofi.nix
index 99826e4..9d4b3cc 100644
--- a/gui/rofi.nix
+++ b/gui/rofi.nix
@@ -10,45 +10,22 @@ in {
enable = true;
location = "top";
font = "Iosevka 12";
- separator = "none";
- scrollbar = false;
- borderWidth = 6;
- yoffset = -6;
- colors = {
- window = {
- background = "#222222";
- border = "#aadb0f";
- separator = "#000000";
+ theme = let
+ inherit (config.lib.formats.rasi) mkLiteral;
+ in {
+ " @import" = "default";
+ "*" = {
+ background = mkLiteral "#222222";
+ foreground = mkLiteral "#F2F2F2";
+ lightbg = mkLiteral "#161616";
+ lightfg = mkLiteral "#F2F2F2";
+ blue = mkLiteral "#aadb0f";
};
- rows = {
- normal = {
- background = "#222222";
- foreground = "#8e8e8e";
- backgroundAlt = "#161616";
- highlight = {
- background = "#111111";
- foreground = "#aadb0f";
- };
- };
- active = {
- background = "#222222";
- foreground = "#8e8e8e";
- backgroundAlt = "#161616";
- highlight = {
- background = "#111111";
- foreground = "#aadb0f";
- };
- };
- urgent = {
- background = "#222222";
- foreground = "#dc322f";
- backgroundAlt = "#161616";
- highlight = {
- background = "#dc322f";
- foreground = "#161616";
- };
- };
+ window = {
+ border = 6;
+ y-offset = -6;
+ border-color = mkLiteral "#aadb0f";
};
};