diff --git a/flake.lock b/flake.lock index ac15c17..bdb26bf 100644 --- a/flake.lock +++ b/flake.lock @@ -304,16 +304,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792094642, - "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", + "lastModified": 1792030654, + "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", + "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index fcb0283..3151959 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "lucy's nix config"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; nix-easyroam = { diff --git a/modules/home/nixcord.nix b/modules/home/nixcord.nix deleted file mode 100644 index 64ed114..0000000 --- a/modules/home/nixcord.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ inputs, ... }: { - flake.homeModules.nixcord = { - imports = [ inputs.nixcord.homeModules.nixord ]; - programs.nixcord = { - enable = true; - discord.enable = false; - vesktop.enable = true; - config.useQuickCss = true; - config.plugins = { - messageLogger.enable = true; - messageClickActions.enable = true; - }; - }; - }; -} diff --git a/modules/home/programs/ghostty.nix b/modules/home/programs/ghostty.nix index abe638a..3628baa 100644 --- a/modules/home/programs/ghostty.nix +++ b/modules/home/programs/ghostty.nix @@ -1,13 +1,5 @@ { ... }: { flake.homeModules.ghostty = { - programs.ghostty = { - enable = true; - enableZshIntegration = true; - settings = { - window-padding-x = 15; - window-padding-y = 15; - confirm-close-surface = false; - }; - }; + }; } diff --git a/modules/system/core/user.nix b/modules/system/core/user.nix index e82ccdb..d397beb 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -1,4 +1,4 @@ -{ inputs, self, ... }: { +{ inputs, ... }: { flake.nixosModules.user = { imports = [ inputs.home-manager.nixosModules.home-manager @@ -14,8 +14,6 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs; }; - home-manager.sharedModules = with self.homeModules; [ - - ]; + }; } diff --git a/modules/system/programs/default.nix b/modules/system/programs/default.nix deleted file mode 100644 index e4458ef..0000000 --- a/modules/system/programs/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: { - flake.nixosModules.programs = { - programs.niri.enable = true; - programs.steam.enable = true; - programs.direnv.enable = true; - }; -} diff --git a/modules/system/programs/zsh.nix b/modules/system/programs/zsh.nix deleted file mode 100644 index 9c3c153..0000000 --- a/modules/system/programs/zsh.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ ... }: { - flake.nixosModules.zsh = { - programs.zsh = { - enable = true; - enableCompletion = true; - autosuggestions.enable = true; - syntaxHighlighting.enable = true; - ohMyZsh = { - enable = true; - theme = "gentoo"; - }; - shellInit = '' - export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/rbw/ssh-agent-socket" - eval "$(devenv hook zsh)" - ''; - }; - system.userActivationScripts.zshrc = "touch .zshrc"; - }; -} diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index cd8cf28..d04e3d9 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -6,7 +6,6 @@ stylix = { enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - }; }; } diff --git a/modules/system/stylix/targets.nix b/modules/system/stylix/targets.nix index 81b064f..ec95846 100644 --- a/modules/system/stylix/targets.nix +++ b/modules/system/stylix/targets.nix @@ -1,5 +1,6 @@ { inputs, ... }: { flake.nixosModules.stylixTargets = { + imports = [ inputs.stylix.nixosModules.stylix ]; stylix.autoEnable = false; stylix.targets = { gtk.enable = true; diff --git a/modules/system/stylix/wallpaper.png b/modules/system/stylix/wallpaper.png deleted file mode 100644 index 24abfee..0000000 Binary files a/modules/system/stylix/wallpaper.png and /dev/null differ