From e352f95114d77dae2be48b9db045d19d3bd6cd7d Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sat, 12 Aug 2023 18:57:16 -0700 Subject: [PATCH] all: welcome to 23.05 --- flake.lock | 206 ++++++++++++++----------- flake.nix | 7 +- home/profiles/desktop/default.nix | 15 +- home/profiles/desktop/polybar/config | 74 +++------ hosts/box/configuration.nix | 4 - hosts/cube/configuration.nix | 2 - hosts/curve/configuration.nix | 3 - hosts/helix/configuration.nix | 3 - hosts/lituus/configuration.nix | 1 - hosts/profiles/core/default.nix | 2 + hosts/profiles/desktop/default.nix | 3 +- hosts/profiles/gitea/default.nix | 10 +- hosts/profiles/gonic/default.nix | 8 +- hosts/profiles/kuberenetes/default.nix | 4 +- hosts/profiles/monitoring/default.nix | 7 +- hosts/profiles/music/default.nix | 15 +- hosts/profiles/server/default.nix | 4 +- hosts/users/anish/default.nix | 1 + modules/nixos/default.nix | 1 - modules/nixos/gonic.nix | 4 +- 20 files changed, 182 insertions(+), 192 deletions(-) diff --git a/flake.lock b/flake.lock index 946e22bb..dbbb120b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "agenix": { "inputs": { "darwin": "darwin", + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1677126346, - "narHash": "sha256-4s+PPGC1M07QsPyeye5drc2JLa1lhDnCV3XAsG8+pH4=", + "lastModified": 1690228878, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "owner": "ryantm", "repo": "agenix", - "rev": "c2a71c83c70844c5e31db69347e86af080bcdad0", + "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", "type": "github" }, "original": { @@ -77,11 +78,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1683779844, - "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", + "lastModified": 1686747123, + "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "c80189917086e43d49eece2bd86f56813500a0eb", + "rev": "724463b5a94daa810abfc64a4f87faef4e00f984", "type": "github" }, "original": { @@ -129,11 +130,11 @@ ] }, "locked": { - "lastModified": 1684783210, - "narHash": "sha256-hxRbwwBTu1G1u1EdI9nEo/n4HIsQIfNi+2BQ1nEoj/o=", + "lastModified": 1690739034, + "narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=", "owner": "nix-community", "repo": "disko", - "rev": "f0b9f374bb42fdcd57baa7d4448ac5d4788226bd", + "rev": "4015740375676402a2ee6adebc3c30ea625b9a94", "type": "github" }, "original": { @@ -153,11 +154,11 @@ ] }, "locked": { - "lastModified": 1672946489, - "narHash": "sha256-IliWerC9qk4MxYNRoe/8uuQZkqjPJPsph46fmVBvo9U=", + "lastModified": 1690660426, + "narHash": "sha256-YUuH1BZ3G5dhHRZ1Z9XPXyorm8vV8G+jYbcdIGxOcOs=", "owner": "elkowar", "repo": "eww", - "rev": "6a64a286291456984011c4fb160def106ee55dff", + "rev": "dc3129aee2806823bdad87785f7ef80651d5245c", "type": "github" }, "original": { @@ -245,12 +246,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -260,12 +264,15 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -298,11 +305,11 @@ }, "hardware": { "locked": { - "lastModified": 1677232326, - "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=", + "lastModified": 1691179816, + "narHash": "sha256-WSMwqzU70ZMRHv1CUAfHEEKJuB0c9c9r0F+lJehXfSI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2", + "rev": "87e3122b67587492a617764f88c71991893fcf8a", "type": "github" }, "original": { @@ -314,16 +321,16 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" - ], - "utils": "utils_2" + ] }, "locked": { - "lastModified": 1677104801, - "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=", + "lastModified": 1682203081, + "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f", + "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", "type": "github" }, "original": { @@ -332,6 +339,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, "llamacpp": { "inputs": { "flake-utils": "flake-utils_3", @@ -340,11 +368,11 @@ ] }, "locked": { - "lastModified": 1681311976, - "narHash": "sha256-vxtBq4PeYkRWML6IJhbhDhdyBfaLSzCg1rNu2ozuPAk=", + "lastModified": 1691180171, + "narHash": "sha256-ZmSRPACkLlPWtKfux9o+FB0mXZbINowyb0057ouAL/0=", "owner": "ggerganov", "repo": "llama.cpp", - "rev": "e7f6997f897a18b6372a6460e25c5f89e1469f1d", + "rev": "332311234a0aa2974b2450710e22e09d90dd6b0b", "type": "github" }, "original": { @@ -361,11 +389,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1663958238, - "narHash": "sha256-l4VrBCswq500YwsgjK7M8HUmnVWrHYY7DKZ7uZK5Abg=", + "lastModified": 1683490239, + "narHash": "sha256-QKzpvl2XrqbobWq/I/smDa9hEniwctjJybXPVILHP0w=", "owner": "coffeetables", "repo": "nix-matrix-appservices", - "rev": "efdc09f26e3b01801edaa3b0e2bdd46d9d133bba", + "rev": "e795d2fbc61da45d49802bb3e8f8d0c70ddc1e68", "type": "gitlab" }, "original": { @@ -391,11 +419,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1677232326, - "narHash": "sha256-rAk2/80kLvA3yIMmSV86T1B4kNvwCFMSQ1FxXndaUB0=", + "lastModified": 1691179816, + "narHash": "sha256-WSMwqzU70ZMRHv1CUAfHEEKJuB0c9c9r0F+lJehXfSI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2d44015779cced4eec9df5b8dab238b9f6312cb2", + "rev": "87e3122b67587492a617764f88c71991893fcf8a", "type": "github" }, "original": { @@ -423,27 +451,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1677075010, - "narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", + "lastModified": 1691155011, + "narHash": "sha256-O15tC0ysw+fcacEbOzrDrkVNIR+SgtArSGvpgsEqpvA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", + "rev": "9652a97d9738d3e65cf33c0bc24429e495a7868f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1677243766, - "narHash": "sha256-a+2V68cLjb951pYBEGbQGEVBcgti40uWtxTVnzvGFhY=", + "lastModified": 1691214006, + "narHash": "sha256-kdfBd+Y0DTOOdgSA6h6iIn403xVj4bzLnXqb7+yM6lQ=", "owner": "nix-community", "repo": "NUR", - "rev": "9bde3171aeb5954b7955fcb09b231f53caf76b54", + "rev": "963ad2d1bb0a8f59b2c23ab521d4dff2148aad16", "type": "github" }, "original": { @@ -456,15 +484,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "vimwiki-cli": "vimwiki-cli" + ] }, "locked": { - "lastModified": 1684565989, - "narHash": "sha256-sz80CLeeJ3+o1GT2ruBd7jjhN8qaraXA7SCUulg99mM=", + "lastModified": 1691215224, + "narHash": "sha256-sajUJsMFxIVUiDUxbRdukGy650lDLmUQG6FUOuzLs+A=", "ref": "main", - "rev": "ab56f9f23502475e6d88785155023a80dc2bda4f", - "revCount": 716, + "rev": "cb1c91802c74065cf9b8ecb35e14fb75d896bc39", + "revCount": 943, "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" }, @@ -483,7 +510,7 @@ "eww": "eww", "grasp": "grasp", "hardware": "hardware", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "llamacpp": "llamacpp", "nix-matrix-appservices": "nix-matrix-appservices", "nixos-hardware": "nixos-hardware", @@ -504,11 +531,11 @@ ] }, "locked": { - "lastModified": 1677205778, - "narHash": "sha256-DFe09uzS+8LjGBAAyHkB/5Axs0j/PQ8RLWFzm2FUZLA=", + "lastModified": 1691201768, + "narHash": "sha256-h+QJMpawZoK1+8efF6UjQoY1EHZfHteXVa5OYnlqRWA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b91706f9d5a68fecf97b63753da8e9670dff782b", + "rev": "18ee2a71de24273e4ad4503b5604532f0b53f382", "type": "github" }, "original": { @@ -534,6 +561,36 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tidal-src": { "flake": false, "locked": { @@ -559,7 +616,7 @@ ], "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", - "utils": "utils_3", + "utils": "utils_2", "vim-tidal-src": "vim-tidal-src", "vowel-src": "vowel-src" }, @@ -579,11 +636,11 @@ }, "unstable": { "locked": { - "lastModified": 1682268651, - "narHash": "sha256-2eZriMhnD24Pmb8ideZWZDiXaAVe6LzJrHQiNPck+Lk=", + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e78d25df6f1036b3fa76750ed4603dd9d5fe90fc", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", "type": "github" }, "original": { @@ -609,21 +666,6 @@ } }, "utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -655,28 +697,6 @@ "type": "github" } }, - "vimwiki-cli": { - "inputs": { - "nixpkgs": [ - "poonam", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1662448409, - "narHash": "sha256-Xd8CuFcEpEQK/TjNBXcp1HqPJCc7LwkMqKa1WiAP1Zc=", - "ref": "main", - "rev": "a73c4695cf116c2e8194a5caa837c2f9e1a7e2fb", - "revCount": 7, - "type": "git", - "url": "ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli" - }, - "original": { - "ref": "main", - "type": "git", - "url": "ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli" - } - }, "vimwikicli": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 091a69c6..578cb0d9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Home manager - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hardware.url = "github:nixos/nixos-hardware"; @@ -233,10 +233,9 @@ agenix.nixosModules.age self.nixosModules.backup self.nixosModules.wireguard - self.nixosModules.wallabag self.nixosModules.gonic + self.nixosModules.wallabag self.nixosModules.ulogger-server - self.nixosModules.photoprism grasp.nixosModule home-manager.nixosModules.home-manager { diff --git a/home/profiles/desktop/default.nix b/home/profiles/desktop/default.nix index c57bcca0..d42f5890 100644 --- a/home/profiles/desktop/default.nix +++ b/home/profiles/desktop/default.nix @@ -33,6 +33,13 @@ in termpdfpy ]; + # GTK4 color scheme? + dconf.settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + }; + }; + # Move required config files around xdg.enable = true; # This doesn't seem to do anything so we have below xdg.configHome = "/home/anish/.config"; # TODO bad hardcode @@ -58,6 +65,11 @@ in ".config/kitty/ayu.conf".source = ./ayu-kitty.conf; ".config/zathura/zathurarc".source = ./zathurarc; ".background-image".source = ./background.jpg; + #gtk4 theme + ".config/gtk-4.0/settings.ini".text = '' + [Settings] + gtk-application-prefer-dark-theme=1 + ''; # gtk3 theme ".config/gtk-3.0/settings.ini".text = '' [Settings] @@ -65,7 +77,7 @@ in gtk-icon-theme-name=Paper gtk-cursor-theme-name=Capitaine Cursors - White gtk-fallback-icon-theme=gnome - gtk-application-prefer-dark-theme=true + gtk-application-prefer-dark-theme=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintfull gtk-xft-rgba=none @@ -76,7 +88,6 @@ in gtk-icon-theme-name=Capitaine Cursors - White gtk-font-name="Sans 10" ''; - # TODO hardcoded ".local/bin/passmenu".source = ./bin/passmenu; ".local/bin/paste".source = ./bin/paste; ".local/bin/bluetoothmenu".source = ./bin/bluetoothmenu; diff --git a/home/profiles/desktop/polybar/config b/home/profiles/desktop/polybar/config index 4532935a..8cc4fb81 100644 --- a/home/profiles/desktop/polybar/config +++ b/home/profiles/desktop/polybar/config @@ -34,9 +34,6 @@ fixed-center = true width = 100% height = 34 -offset-x = -offset-y = - ; Background ARGB color (e.g. #f00, #ff992a, #ddff1023) background = ${colors.bg} @@ -49,7 +46,7 @@ line-color = #fff ; Number of spaces to add at the beginning/end of the bar ; Individual side values can be defined using: ; padding-{left,right} -padding-right = 1 +padding-right = 1 padding-left = 0 ; Number of spaces to add before/after each module @@ -58,14 +55,14 @@ padding-left = 0 module-margin = 0 margin-bottom = 34 -font-0 = "Iosevka Term:pixelsize=13;4" -font-1 = "Iosevka Term:pixelsize=6;1" -font-2 = "Fira Code:pixelsize=13;2" +font-0 = "Iosevka Nerd Font,Iosevka NF:pixelsize=12;4" +font-1 = "Iosevka Nerd Font,Iosevka NF:pixelsize=6;1" +font-2 = "FiraCode Nerd Font:pixelsize=12;2" font-3 = "Siji:pixelsize=8;2" ; Add module mpd for artist - title info modules-left = bspwm sps volume -modules-center = title +; modules-center = title modules-right = wireless-network sps battery sps memory sps cpu sps date ; The separator will be inserted between the output of each module @@ -116,11 +113,11 @@ type = internal/bspwm pin-workspaces = true enable-click = true -ws-icon-0 = 1;%{T1}%{T-} -ws-icon-1 = 2;%{T1}%{T-} -ws-icon-2 = 3;%{T1}%{T-} -ws-icon-3 = 4;%{T1}%{T-} -ws-icon-4 = 5;%{T1}%{T-} +ws-icon-0 = 1;%{T1} %{T-} +ws-icon-1 = 2;%{T1} %{T-} +ws-icon-2 = 3;%{T1}󰵅 %{T-} +ws-icon-3 = 4;%{T1} %{T-} +ws-icon-4 = 5;%{T1} %{T-} ws-icon-default =  ; fuzzy-match = true @@ -157,14 +154,14 @@ interval = 1.0 ; See "http://en.cppreference.com/w/cpp/io/manip/put_time" for details on how to format the date string ; NOTE: if you want to use syntax tags here you need to use %%{...} -date = %{T1}%{T-}%{T2} %d/%a%{T-} +date = %{T1} %{T-}%{T2} %d/%a%{T-} ; Optional time format time = %{T2} %H:%M%{T-} ; if `date-alt` or `time-alt` is defined, clicking ; the module will toggle between formats -date-alt = %{T1}%{T-}%{T2} %a, %d %b %y%{T-} +date-alt = %{T1} %{T-} %{T2} %a, %d %b %y%{T-} time-alt = %{T2} %H:%M:%S%{T-} label = %date%%time% @@ -177,11 +174,11 @@ interface = wlp3s0 label-connected = %essid% label-connected-font = 2 -format-connected = +format-connected = label-connected-foreground = #82b414 format-disconnected = -label-disconnected = "睊" +label-disconnected = "󰖪" label-disconnected-foreground = #f92672 ramp-signal-foreground = #82b414 @@ -199,7 +196,7 @@ type = internal/cpu ; Default: 1 interval = 0.5 -label = %{T1}%{T-}%{T2} %percentage:2%%%{T-} +label = %{T1} %{T-}%{T2} %percentage:2%%%{T-} label-foreground = ${colors.cyan} @@ -229,7 +226,7 @@ format =