diff --git a/flake.lock b/flake.lock index bdb26bf..ac15c17 100644 --- a/flake.lock +++ b/flake.lock @@ -304,16 +304,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792030654, - "narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-26.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3151959..fcb0283 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "lucy's nix config"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 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 new file mode 100644 index 0000000..64ed114 --- /dev/null +++ b/modules/home/nixcord.nix @@ -0,0 +1,15 @@ +{ 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 3628baa..abe638a 100644 --- a/modules/home/programs/ghostty.nix +++ b/modules/home/programs/ghostty.nix @@ -1,5 +1,13 @@ { ... }: { 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 d397beb..e82ccdb 100644 --- a/modules/system/core/user.nix +++ b/modules/system/core/user.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: { +{ inputs, self, ... }: { flake.nixosModules.user = { imports = [ inputs.home-manager.nixosModules.home-manager @@ -14,6 +14,8 @@ 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 new file mode 100644 index 0000000..e4458ef --- /dev/null +++ b/modules/system/programs/default.nix @@ -0,0 +1,7 @@ +{ ... }: { + 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 new file mode 100644 index 0000000..9c3c153 --- /dev/null +++ b/modules/system/programs/zsh.nix @@ -0,0 +1,19 @@ +{ ... }: { + 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 d04e3d9..cd8cf28 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -6,6 +6,7 @@ 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 ec95846..81b064f 100644 --- a/modules/system/stylix/targets.nix +++ b/modules/system/stylix/targets.nix @@ -1,6 +1,5 @@ { 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 new file mode 100644 index 0000000..24abfee Binary files /dev/null and b/modules/system/stylix/wallpaper.png differ