Compare commits

..
11 changed files with 133 additions and 278 deletions

123
flake.lock generated
View file

@ -18,24 +18,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1785627969,
"narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -70,27 +52,6 @@
"type": "github" "type": "github"
} }
}, },
"nixcord": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2",
"nixpkgs-nixcord": "nixpkgs-nixcord",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1788082709,
"narHash": "sha256-NRJUB6pVNqLpX2apWi6fCz5j47ZePRI25f+9H0WYs6Y=",
"owner": "4evy",
"repo": "nixcord",
"rev": "208ae34f932f1ddda36553190169af1ba920481a",
"type": "github"
},
"original": {
"owner": "4evy",
"repo": "nixcord",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1787209939, "lastModified": 1787209939,
@ -107,54 +68,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1785031560,
"narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-nixcord": {
"locked": {
"lastModified": 1786711500,
"narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1786711500,
"narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1788039129, "lastModified": 1788039129,
"narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=", "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
@ -174,46 +88,11 @@
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixcord": "nixcord", "nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"tt-discord": "tt-discord",
"tt-schemes": "tt-schemes", "tt-schemes": "tt-schemes",
"tt-terminal": "tt-terminal" "tt-terminal": "tt-terminal"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixcord",
"nixpkgs"
]
},
"locked": {
"lastModified": 1785945821,
"narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"tt-discord": {
"flake": false,
"locked": {
"narHash": "sha256-a94aaomwiDeaoFKy3YXGVu6iMuIHtxXoFtGAse8tFz8=",
"type": "file",
"url": "https://git.lucy.rip/lucy/tinted-discord.git"
},
"original": {
"type": "file",
"url": "https://git.lucy.rip/lucy/tinted-discord.git"
}
},
"tt-schemes": { "tt-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -3,7 +3,6 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
base16.url = "github:SenchoPens/base16.nix"; base16.url = "github:SenchoPens/base16.nix";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
nixcord.url = "github:4evy/nixcord";
tt-schemes = { tt-schemes = {
url = "github:tinted-theming/schemes"; url = "github:tinted-theming/schemes";
flake = false; flake = false;
@ -12,10 +11,6 @@
url = "github:tinted-theming/tinted-terminal"; url = "github:tinted-theming/tinted-terminal";
flake = false; flake = false;
}; };
tt-discord = {
url = "https://git.lucy.rip/lucy/tinted-discord.git";
flake = false;
};
}; };
outputs = outputs =
@ -24,15 +19,20 @@
nixpkgs, nixpkgs,
base16, base16,
home-manager, home-manager,
nixcord,
... ...
}@inputs: }@inputs:
{ {
nixosConfigurations.nerv = nixpkgs.lib.nixosSystem { nixosConfigurations.nerv = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# set the theme ./theme.nix
./modules/themeing ({ pkgs, ... }: {
config.theming.theme = "gruvbox-dark-hard";
config.theming.font = "Iosevka";
config.theming.fontPackage = pkgs.iosevka;
})
base16.nixosModule
({ config, ... }: { scheme = "${config.theming.theme}"; })
./modules/hosts/nerv/configuration.nix ./modules/hosts/nerv/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@ -40,10 +40,13 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
imports = [ imports = [
./modules/themeing ./modules/hosts/nerv/home.nix
./modules/programs ./modules/programs/emacs.nix
./modules/programs/niri.nix
./modules/programs/foot.nix
./modules/programs/quickshell.nix
./modules/programs/fuzzel.nix
]; ];
home-manager.users.lucy = ./modules/hosts/nerv/home.nix;
} }
]; ];
}; };

View file

@ -7,13 +7,13 @@ let
c = config.scheme.withHashtag; c = config.scheme.withHashtag;
in in
{ {
home-manager.users.lucy = {
home.packages = with pkgs; [ home.packages = with pkgs; [
nixd nixd
nixfmt nixfmt
clang clang
kdePackages.qtdeclarative kdePackages.qtdeclarative
]; ];
home.stateVersion = "26.05"; home.stateVersion = "26.05";
home.pointerCursor = { home.pointerCursor = {
enable = true; enable = true;
@ -80,4 +80,5 @@ in
''; '';
}; };
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
} }

View file

@ -1,9 +0,0 @@
{
imports = [
./foot.nix
./niri.nix
./emacs.nix
./fuzzel.nix
./quickshell.nix
];
}

View file

@ -3,7 +3,7 @@
... ...
}: }:
{ {
programs.emacs = { home-manager.users.lucy.programs.emacs = {
enable = true; enable = true;
extraPackages = extraPackages =
epkgs: with epkgs.melpaPackages; [ epkgs: with epkgs.melpaPackages; [

View file

@ -8,7 +8,7 @@ let
c = config.scheme; c = config.scheme;
in in
{ {
programs.foot = { home-manager.users.lucy.programs.foot = {
enable = true; enable = true;
settings = { settings = {
main = { main = {

View file

@ -3,7 +3,7 @@ let
c = config.scheme.withHashtag; c = config.scheme.withHashtag;
in in
{ {
home-manager.users.lucy = {
programs.fuzzel = { programs.fuzzel = {
enable = true; enable = true;
settings = { settings = {
@ -20,5 +20,5 @@ in
}; };
}; };
}; };
};
} }

View file

@ -1,6 +1,6 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
wayland.windowManager.niri = { home-manager.users.lucy.wayland.windowManager.niri = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
prefer-no-csd prefer-no-csd

View file

@ -1,8 +0,0 @@
{ inputs, config, lib, ... }: {
imports = [ inputs.nixcord.homeModules.nixcord ];
programs.nixcord = {
enable = true;
discord.vencord.enable = true;
quickCss = (config.scheme inputs.tt-discord);
};
}

View file

@ -4,6 +4,7 @@ let
in in
{ {
home-manager.users.lucy = {
programs.quickshell.enable = true; programs.quickshell.enable = true;
programs.quickshell.systemd.enable = true; programs.quickshell.systemd.enable = true;
xdg.configFile."quickshell/Colors.js" = { xdg.configFile."quickshell/Colors.js" = {
@ -31,4 +32,5 @@ in
force = true; force = true;
}; };
};
} }

View file

@ -1,12 +1,4 @@
{ { lib, inputs, ...}: {
lib,
inputs,
pkgs,
config,
...
}:
{
imports = [ inputs.base16.nixosModule ];
options.theming.theme = lib.mkOption { options.theming.theme = lib.mkOption {
type = lib.types.str; type = lib.types.str;
apply = name: "${inputs.tt-schemes}/base16/${name}.yaml"; apply = name: "${inputs.tt-schemes}/base16/${name}.yaml";
@ -17,9 +9,4 @@
options.theming.fontPackage = lib.mkOption { options.theming.fontPackage = lib.mkOption {
type = lib.types.package; type = lib.types.package;
}; };
config.theming.theme = "catppuccin-mocha";
config.theming.font = "Iosevka";
config.theming.fontPackage = pkgs.iosevka;
config.scheme = config.theming.theme;
} }