diff --git a/flake.lock b/flake.lock index 50b0412..e5f87a9 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,89 @@ "type": "github" } }, + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1756083905, + "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -123,19 +206,40 @@ "type": "indirect" } }, - "fw-pkgs": { + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1730710113, - "narHash": "sha256-6DtfJyoScSuTKVjPH8INHACl/7qX3OqbA61UI2u5a1c=", - "owner": "fwastring", - "repo": "fwpkgs", - "rev": "fb322b3c8c413c3bd4d5222fe4b9566ab2998c58", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { - "owner": "fwastring", - "ref": "main", - "repo": "fwpkgs", + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", "type": "github" } }, @@ -149,11 +253,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -206,6 +310,23 @@ "type": "github" } }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.2", + "repo": "gnome-shell", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -235,16 +356,15 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757385184, + "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -294,11 +414,11 @@ ] }, "locked": { - "lastModified": 1755678602, - "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", + "lastModified": 1756891319, + "narHash": "sha256-/e6OXxzbAj/o97Z1dZgHre4bNaVjapDGscAujSCQSbI=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", + "rev": "621e2e00f1736aa18c68f7dfbf2b9cff94b8cc4d", "type": "github" }, "original": { @@ -323,11 +443,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1756977414, - "narHash": "sha256-Hz5S4fILpYd1smWDZ+uLYjHgW22v6JS/04j15I4cFZE=", + "lastModified": 1757423991, + "narHash": "sha256-tL+b6WC4gJJSo6wjNVIZpQ0DsYg8RmoGHxYuk6jJKbU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4e785d12a91117cd5b255052799d1a051d9976c0", + "rev": "150d693fe794a01aab762a18d2d8a2c8bc54b43c", "type": "github" }, "original": { @@ -445,11 +565,11 @@ ] }, "locked": { - "lastModified": 1753622892, - "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "lastModified": 1756810301, + "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", "type": "github" }, "original": { @@ -508,22 +628,6 @@ "type": "github" } }, - "k9s-config": { - "flake": false, - "locked": { - "lastModified": 1756976593, - "narHash": "sha256-yE1S4hsfy8NlPRZKuezgHyHqZo5nIqf6y42us6vcA4Y=", - "owner": "fwastring", - "repo": "k9s", - "rev": "21df095f01accd28ae1bf86b997b47301096f580", - "type": "github" - }, - "original": { - "owner": "fwastring", - "repo": "k9s", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_2", @@ -535,11 +639,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757117124, - "narHash": "sha256-ZUnJehqxYrhfvIdLrFC3l/w8pX4ObEIWZYqL1UpgvRE=", + "lastModified": 1757376306, + "narHash": "sha256-xZ9agpXP92762wo6pEZd1gs1jJEjrd4WWGtzlpY3QaA=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b447e494cafb7adaf396714a285245e4d1536a6a", + "rev": "b142f8f6336853ff325fe39c9f658e51e42c781b", "type": "github" }, "original": { @@ -551,11 +655,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1757081548, - "narHash": "sha256-24Jg5pMGTofEJ6Pz6OBDAMH6hc9gbMqgZhhVe+uZF3M=", + "lastModified": 1757369388, + "narHash": "sha256-nLc2Oi6N2DfZTVBl8plpSlx13DQGc087ziWymAyjkOI=", "owner": "neovim", "repo": "neovim", - "rev": "069be911064d0e64f1efc13348dbb878afaf347f", + "rev": "acb99b8a6572d8ea8d917955a653945550923be0", "type": "github" }, "original": { @@ -566,27 +670,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -598,11 +686,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "lastModified": 1757034884, + "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "rev": "ca77296380960cd497a765102eeb1356eb80fed0", "type": "github" }, "original": { @@ -614,33 +702,42 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nvim-config": { - "flake": false, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1756970481, - "narHash": "sha256-mfUYGgb81Lw18h5mvlyv0eAUe8Zoj0dKsXqHodKgBsE=", - "owner": "fwastring", - "repo": "nvim", - "rev": "e8fe294a0c3f16a2cb898e4bec6ef34998e14424", + "lastModified": 1756961635, + "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=", + "owner": "nix-community", + "repo": "NUR", + "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370", "type": "github" }, "original": { - "owner": "fwastring", - "repo": "nvim", + "owner": "nix-community", + "repo": "NUR", "type": "github" } }, @@ -654,11 +751,11 @@ ] }, "locked": { - "lastModified": 1755960406, - "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", + "lastModified": 1757239681, + "narHash": "sha256-E9spYi9lxm2f1zWQLQ7xQt8Xs2nWgr1T4QM7ZjLFphM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", + "rev": "ab82ab08d6bf74085bd328de2a8722c12d97bd9d", "type": "github" }, "original": { @@ -669,14 +766,45 @@ }, "root": { "inputs": { - "fw-pkgs": "fw-pkgs", "home-manager": "home-manager", "hyprland": "hyprland", - "k9s-config": "k9s-config", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", - "nvim-config": "nvim-config" + "stylix": "stylix" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts_3", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1757360005, + "narHash": "sha256-VwzdFEQCpYMU9mc7BSQGQe5wA1MuTYPJnRc9TQCTMcM=", + "owner": "nix-community", + "repo": "stylix", + "rev": "834a743c11d66ea18e8c54872fbcc72ce48bc57f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" } }, "systems": { @@ -694,6 +822,102 @@ "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" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1754779259, + "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1754788770, + "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "fb2175accef8935f6955503ec9dd3c973eec385c", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1755613540, + "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6e43330..c94e4e6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,25 +3,21 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - fw-pkgs.url = "github:fwastring/fwpkgs/main"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + stylix = { + url = "github:nix-community/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # fw-pkgs.url = "github:fwastring/fwpkgs/main"; - # Neovim - neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; + # Neovim + neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-25.05"; - hyprland.url = "github:hyprwm/Hyprland"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nvim-config = { - url = "github:fwastring/nvim?exportIgnore=1"; - flake = false; - }; - k9s-config = { - url = "github:fwastring/k9s?exportIgnore=1"; - flake = false; - }; + + hyprland.url = "github:hyprwm/Hyprland"; }; outputs = @@ -29,25 +25,18 @@ self, nixpkgs, home-manager, - nixpkgs-unstable, - fw-pkgs, + stylix, ... }@inputs: let inherit (self) outputs; system = "x86_64-linux"; - overlay-unstable = final: prev: { - unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - }; - overlay-fw-pkgs = final: prev: { - fw-pkgs = import fw-pkgs { - inherit system; - config.allowUnfree = false; - }; - }; + # overlay-fw-pkgs = final: prev: { + # fw-pkgs = import fw-pkgs { + # inherit system; + # config.allowUnfree = false; + # }; + # }; in { # NixOS configuration entrypoint @@ -59,12 +48,6 @@ myhostname = "laptop"; }; modules = [ - ( - { nixpkgs, ... }: - { - nixpkgs.overlays = [ overlay-unstable ]; - } - ) ./maskiner/laptop/configuration.nix ]; }; @@ -74,12 +57,6 @@ myhostname = "desktop"; }; modules = [ - ( - { nixpkgs, ... }: - { - nixpkgs.overlays = [ overlay-unstable ]; - } - ) ./maskiner/desktop/configuration.nix ]; }; @@ -88,30 +65,20 @@ inherit inputs outputs; myhostname = "jobb"; }; - modules = [ - ( - { nixpkgs, ... }: - { - nixpkgs.overlays = [ overlay-unstable overlay-fw-pkgs ]; - } - ) - ./maskiner/jobb/configuration.nix - ]; + modules = [ + ./maskiner/jobb/configuration.nix + stylix.nixosModules.stylix + home-manager.nixosModules.home-manager + ]; }; work-desktop = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; myhostname = "work-desktop"; }; - modules = [ - ( - { nixpkgs, ... }: - { - nixpkgs.overlays = [ overlay-unstable ]; - } - ) - ./maskiner/work-desktop/configuration.nix - ]; + modules = [ + ./maskiner/work-desktop/configuration.nix + ]; }; macmini = nixpkgs.lib.nixosSystem { specialArgs = { diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index 56ea2e1..cda5c1a 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -18,7 +18,6 @@ in ../../moduler/base.nix - inputs.home-manager.nixosModules.home-manager ../../moduler/users.nix ../../moduler/network.nix ../../moduler/programs.nix @@ -29,11 +28,21 @@ in ../../moduler/sound.nix ]; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml"; + }; + home-manager.extraSpecialArgs = { inherit inputs pkgs; }; home-manager.users.fw = { imports = [ ./../../moduler/home.nix ]; + stylix.targets = { + lazygit.enable = false; + fish.enable = false; + kitty.enable = false; + }; }; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -42,28 +51,22 @@ in patches = [ ../../moduler/btusb-add-mt7925.patch ]; })) ]; - hardware.enableRedistributableFirmware = true; networking.hostName = myhostname; - environment.systemPackages = with pkgs; [ - gonic - ]; - services = { tailscale = { enable = true; - package = pkgs.unstable.tailscale; - }; - searx = { - enable = true; - redisCreateLocally = true; - settings.server = { - bind_address = "::1"; - port = 8000; - secret_key = "alsjdioefj.asdi"; - }; }; + # searx = { + # enable = true; + # redisCreateLocally = true; + # settings.server = { + # bind_address = "::1"; + # port = 8000; + # secret_key = "alsjdioefj.asdi"; + # }; + # }; }; system.stateVersion = "25.05"; diff --git a/maskiner/macmini/configuration.nix b/maskiner/macmini/configuration.nix index 86f5acd..ea094a4 100644 --- a/maskiner/macmini/configuration.nix +++ b/maskiner/macmini/configuration.nix @@ -16,7 +16,7 @@ ]; environment.systemPackages = with pkgs; [ - unstable.lego + lego ]; networking.firewall = { enable = true; diff --git a/moduler/dev.nix b/moduler/dev.nix index df0705c..9686bc5 100644 --- a/moduler/dev.nix +++ b/moduler/dev.nix @@ -46,7 +46,7 @@ in python314 awscli - unstable.minio-client + minio-client hugo sqlc postgresql diff --git a/moduler/dunst.nix b/moduler/dunst.nix index 910ccfa..4a9f234 100644 --- a/moduler/dunst.nix +++ b/moduler/dunst.nix @@ -15,11 +15,11 @@ frame_color = "#eceff1"; corner_radius = 10; }; - urgency_normal = { - background = "#181818"; - foreground = "#dfdfdf"; - timeout = 10; - }; + # urgency_normal = { + # background = "#181818"; + # foreground = "#dfdfdf"; + # timeout = 10; + # }; }; }; } diff --git a/moduler/k9s.nix b/moduler/k9s.nix index 00b1546..e3ba3bc 100644 --- a/moduler/k9s.nix +++ b/moduler/k9s.nix @@ -4,7 +4,4 @@ let in { programs.k9s.enable = true; - - xdg.configFile."k9s".source = inputs.k9s-config; - } diff --git a/moduler/kitty.nix b/moduler/kitty.nix index bf2ef50..4e5bfeb 100644 --- a/moduler/kitty.nix +++ b/moduler/kitty.nix @@ -9,7 +9,7 @@ enable = true; font = { name = "ComicShannsMono Nerd Font"; - size = 12; + size = 14; }; shellIntegration = { mode = "no-cursor"; @@ -20,7 +20,7 @@ cursor_shape = "block"; cursor_blink_interval = 0; enable_audio_bell = false; - window_padding_width = 5; + window_padding_width = 10; }; }; } diff --git a/moduler/lsp.nix b/moduler/lsp.nix index cfd2bf5..fbd9b66 100644 --- a/moduler/lsp.nix +++ b/moduler/lsp.nix @@ -10,7 +10,7 @@ }: { environment.systemPackages = with pkgs; [ - unstable.nixd + nixd gopls inputs.neovim-nightly-overlay.packages.${pkgs.system}.default omnisharp-roslyn diff --git a/moduler/neovim.nix b/moduler/neovim.nix index b9fe0e2..5075b8d 100644 --- a/moduler/neovim.nix +++ b/moduler/neovim.nix @@ -7,7 +7,7 @@ in # programs.neovim.enable = true; # Create a symlink from the Nix store to the Neovim config directory - xdg.configFile."nvim".source = inputs.nvim-config; + # xdg.configFile."nvim".source = inputs.nvim-config; # Other Home Manager options... } diff --git a/moduler/network.nix b/moduler/network.nix index 2ad3db6..74afdff 100644 --- a/moduler/network.nix +++ b/moduler/network.nix @@ -12,7 +12,6 @@ services.netbird = { enable = true; ui.enable = true; - package = pkgs.unstable.netbird; }; environment.systemPackages = with pkgs; [ diff --git a/moduler/programs.nix b/moduler/programs.nix index c5388ef..1ce17a7 100644 --- a/moduler/programs.nix +++ b/moduler/programs.nix @@ -22,8 +22,8 @@ environment.systemPackages = with pkgs; [ # GUI - unstable.feishin - unstable.signal-desktop + feishin + signal-desktop thunderbird libreoffice discord diff --git a/moduler/sound.nix b/moduler/sound.nix index 11c4978..df2cc03 100644 --- a/moduler/sound.nix +++ b/moduler/sound.nix @@ -8,7 +8,6 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - systemWide = true; }; blueman.enable = true; }; diff --git a/moduler/tmux.nix b/moduler/tmux.nix index 199e85e..4764bcb 100644 --- a/moduler/tmux.nix +++ b/moduler/tmux.nix @@ -12,12 +12,12 @@ tmuxPlugins.sensible tmuxPlugins.pain-control tmuxPlugins.sessionist - { - plugin = fw-pkgs.tmuxPlugins.minimal; - extraConfig = '' - bind-key b set-option status - ''; - } + # { + # plugin = fw-pkgs.tmuxPlugins.minimal; + # extraConfig = '' + # bind-key b set-option status + # ''; + # } ]; extraConfig = '' diff --git a/moduler/waybar.nix b/moduler/waybar.nix index 944b569..69a6256 100644 --- a/moduler/waybar.nix +++ b/moduler/waybar.nix @@ -1,166 +1,6 @@ -{ - ... -}: -{ +{...}: let +in { programs.waybar = { enable = true; - systemd.enable = true; - settings = { - mainBar = { - layer = "top"; - "modules-left" = [ - "hyprland/workspaces" - ]; - "modules-right" = [ - "tray" - "clock" - "pulseaudio" - "bluetooth" - ]; - "hyprland/window" = { - format = "{title}"; - "max-length" = 333; - "seperate-outputs" = true; - }; - clock = { - format = "{:%c}"; - "tooltip-format" = "{calendar}"; - calendar = { - mode = "month"; - "mode-mon-col" = 3; - "on-scroll" = 1; - "on-click-right" = "mode"; - format = { - months = "{}"; - days = "{}"; - weeks = "{%W}"; - weekdays = "{}"; - today = "{}"; - }; - }; - actions = { - "on-click-middle" = "mode"; - "on-click-right" = "shift_up"; - "on-click" = "shift_down"; - }; - }; - cpu = { - format = "󰯳 {usage}%"; - }; - memory = { - format = "󰍛 {}%"; - interval = 1; - }; - "hyprland/workspaces" = { - format = "{icon}"; - "active-only" = false; - "sort-by-number" = true; - "on-click" = "activate"; - "all-outputs" = false; - "format-icons" = { - "1" = "1"; - "2" = "2"; - "3" = "3"; - "4" = "4"; - "5" = "5"; - "6" = "6"; - "7" = "7"; - "8" = "8"; - "9" = "9"; - "10" = "10"; - }; - }; - network = { - format = "󰤭 Off"; - "format-wifi" = "{essid} ({signalStrength}%)"; - "format-ethernet" = "󰈀"; - "format-disconnected" = "󰤭 Disconnected"; - "tooltip-format" = "{ifname} via {gwaddr} "; - "tooltip-format-wifi" = "{essid}({signalStrength}%)  "; - "tooltip-format-ethernet" = "󰈀 {ifname}"; - "tooltip-format-disconnected" = "Disconnected"; - }; - pulseaudio = { - format = "{icon} {volume}% {format_source}"; - "format-bluetooth" = "{icon} {volume}% {format_source}"; - "format-bluetooth-muted" = "󰖁 {format_source}"; - "format-muted" = "󰖁 {format_source}"; - "format-source" = " {volume}%"; - "format-source-muted" = ""; - "format-icons" = { - headphone = ""; - phone = ""; - portable = ""; - default = [ - "" - "" - "" - ]; - }; - "on-click-left" = "pavucontrol"; - input = true; - }; - "custom/playerctl" = { - format = "{icon} {}"; - "return-type" = "json"; - "max-length" = 333; - exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F"; - "on-click-middle" = "playerctl play-pause"; - "on-click" = "playerctl previous"; - "on-click-right" = "playerctl next"; - "format-icons" = { - Playing = ""; - Paused = ""; - }; - }; - tray = { - format = "{icon}"; - "icon-size" = 14; - spacing = 5; - }; - idle_inhibitor = { - format = "{icon}"; - "format-icons" = { - activated = "󱠛"; - deactivated = "󱤱"; - }; - }; - "custom/subs" = { - format = "󰗃 {}"; - exec = "/usr/local/bin/subsfile.sh"; - "on-click" = "vivaldi-stable https://youtube.com/thelinuxcast"; - "restart-interval" = 1; - }; - "custom/spacer" = { - format = " "; - }; - "wlr/taskbar" = { - format = "{name}"; - "icon-size" = 14; - "icon-theme" = "Numix-Circle"; - "tooltip-format" = "{title}"; - "on-click" = "activate"; - "on-click-middle" = "close"; - "ignore-list" = [ "Alacritty" ]; - "app_ids-mapping" = { - firefoxdeveloperedition = "firefox-developer-edition"; - }; - }; - bluetooth = { - "on-click" = "./scripts/bluetooth-control"; - "on-click-right" = "./scripts/rofi-bluetooth"; - "on-click-middle" = "./scripts/rofi-bluetooth"; - format = "{icon}"; - interval = 15; - "format-icons" = { - on = ""; - off = "󰂲"; - disabled = "󰂲"; - connected = ""; - }; - "tooltip-format" = "{device_alias} {status}"; - }; - }; - }; }; }