diff options
| -rw-r--r-- | flake.lock | 26 | ||||
| -rw-r--r-- | home/modules/profiles/base/config/sway.nix | 4 | ||||
| -rw-r--r-- | home/modules/profiles/base/config/waybar-settings.nix | 7 | ||||
| -rw-r--r-- | home/modules/profiles/base/config/waybar-style.nix | 3 | ||||
| -rw-r--r-- | home/modules/profiles/development/default.nix | 2 | ||||
| -rw-r--r-- | home/modules/profiles/misc/default.nix | 4 |
6 files changed, 26 insertions, 20 deletions
diff --git a/flake.lock b/flake.lock index 2dd7686..760be7d 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ }, "master": { "locked": { - "lastModified": 1640618094, - "narHash": "sha256-EU/+hGhTdsUcdNV0kb2+U/DH7R41/mMlweFzLuEplhg=", + "lastModified": 1640701001, + "narHash": "sha256-8hgiMtXnGQ8RFhgEcZh6YifE6laezKvDJz+Ojw8XCPc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0736e7e3a90fb6d2ff6e11c077918220a253c9bc", + "rev": "9e12b42be3ea24ddfcecf2eae7eb90798358802b", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1640605963, - "narHash": "sha256-1edQitEq3uWad0xLaWSNwukW7PCmE+JERCNoWno8tZ4=", + "lastModified": 1640690684, + "narHash": "sha256-TcOFDS00n5E/l+JSQC9RKT8Pgor4t2uaZrSV8i0tX+8=", "owner": "neovim", "repo": "neovim", - "rev": "9804a2870f6f308f788f939f52958e3fbd2adaac", + "rev": "645b3145766d945d0dd067ce4f71ceaf5febe29d", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640554034, - "narHash": "sha256-gf7uo/CXrsna/S4Yfaklg8BnyRkDvo3poIzXCClyYaw=", + "lastModified": 1640642730, + "narHash": "sha256-+CEqjEird1aRaIlx4G1Cpc7XH+NVmy/mQvteiICsycU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd241e39f366eb7a41ea94f04f7af5c9508da632", + "rev": "7efd936e4fbe267dbb3c1b572a4a381282ac2bac", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "wallpapers": { "flake": false, "locked": { - "lastModified": 1640621312, - "narHash": "sha256-NGs2QRyMGc5HBNxCLQgCswCekerXhFNGh6NmCdiONo4=", + "lastModified": 1640701523, + "narHash": "sha256-wYOGxfXI0HxkcCdq41BCMgkj8OUNnjzxP25a1DDww94=", "ref": "main", - "rev": "4bb6eae09751cc23e89ebd4158fc779eb6cb919f", - "revCount": 1, + "rev": "e6833a0bd06231ac3ce2c54f8b3b18282ee8d517", + "revCount": 2, "type": "git", "url": "https://git.sr.ht/~boppy/wall" }, diff --git a/home/modules/profiles/base/config/sway.nix b/home/modules/profiles/base/config/sway.nix index d04673e..b43f34d 100644 --- a/home/modules/profiles/base/config/sway.nix +++ b/home/modules/profiles/base/config/sway.nix @@ -18,7 +18,7 @@ bindsym $mod+Return exec $term # set menu - set $menu "${pkgs.bemenu}/bin/bemenu-run -H 18 -l 5 --fn 'Iosevka Pure 10.5' --tb '#c495a2' --tf '#18191f' --hb '#c495a2' --hf '#18191f'" + set $menu "${pkgs.bemenu}/bin/bemenu-run -H 18 -l 5 --fn 'Iosevka Pure 10.5' -p 'run::' --tb '#c495a2' --tf '#18191f' --hb '#c495a2' --hf '#18191f'" bindsym $mod+d exec $menu # change focus @@ -182,7 +182,7 @@ client.focused_inactive $muted $muted $color0 $color5 client.unfocused $muted $muted $color7 $color5 client.urgent $color10 $color10 $color0 $color5 - output "*" bg ${wallpapers}/nixos/nix-glow-gruvbox.png fill + output "*" bg ${wallpapers}/nixos/nix-glow-fg-d4ae80.png fill output "*" scale 1 output "*" scale_filter nearest diff --git a/home/modules/profiles/base/config/waybar-settings.nix b/home/modules/profiles/base/config/waybar-settings.nix index e208895..8cb3ef9 100644 --- a/home/modules/profiles/base/config/waybar-settings.nix +++ b/home/modules/profiles/base/config/waybar-settings.nix @@ -4,7 +4,7 @@ height = 17; modules-left = [ "sway/workspaces" "sway/language" "cpu" "memory" ]; modules-center = [ "clock" ]; - modules-right = [ "custom/weather" "pulseaudio" "network" ]; + modules-right = [ "custom/weather" "pulseaudio" "network" "custom/nixos" ]; modules = { "sway/workspaces" = { @@ -44,6 +44,11 @@ interval = 3600; }; + "custom/nixos" = { + format = " {}"; + exec = "/run/current-system/sw/bin/nixos-version | /run/current-system/sw/bin/grep -o '[0-9]\\+\\.[0-9]\\+' | /run/current-system/sw/bin/head -1"; + }; + "network" = { interval = 5; interface = "enp4s0"; diff --git a/home/modules/profiles/base/config/waybar-style.nix b/home/modules/profiles/base/config/waybar-style.nix index 45edf60..8e55b93 100644 --- a/home/modules/profiles/base/config/waybar-style.nix +++ b/home/modules/profiles/base/config/waybar-style.nix @@ -36,7 +36,8 @@ #tray, #mode, #mpd, - #custom-weather { + #custom-weather, + #custom-nixos { padding: 0 6px; margin: 0; background-color: #c495a2; diff --git a/home/modules/profiles/development/default.nix b/home/modules/profiles/development/default.nix index d85e796..e12ee91 100644 --- a/home/modules/profiles/development/default.nix +++ b/home/modules/profiles/development/default.nix @@ -63,7 +63,7 @@ in ]; }; - home.packages = [ pkgs.ripgrep pkgs.rust-analyzer pkgs.gnupg ]; + home.packages = [ pkgs.ripgrep pkgs.rust-analyzer pkgs.gnupg pkgs.tig ]; services.gpg-agent = { enable = true; diff --git a/home/modules/profiles/misc/default.nix b/home/modules/profiles/misc/default.nix index 19542fa..ba010fd 100644 --- a/home/modules/profiles/misc/default.nix +++ b/home/modules/profiles/misc/default.nix @@ -8,7 +8,7 @@ in }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ spotify ]; - nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" ]; + home.packages = with pkgs; [ spotify blender zoom-us inkscape obsidian ]; + nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" "zoom" "obsidian" ]; }; } |