Kabbone
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Kabbone:dd8159d6a4695c8d42fb93df9f0cf694fdf153da
Branches Tags
Kabbone:main
Kabbone:dev
Kabbone:refactor
..
compare: Kabbone:3060cbfb77dd970ce6a704ea9fb0b092c50b1374
Branches Tags
Kabbone:main
Kabbone:dev
Kabbone:refactor

2 Commits
dd8159d6a4 ... 3060cbfb77

Author SHA1 Message Date
Kabbone 3060cbfb77
flake update 2024-12-19 13:16:52 +01:00
Kabbone 1776697f9b
remove catppucin module 2024-12-19 13:16:40 +01:00
6 changed files with 27 additions and 92 deletions
Show Stats Expand all files Collapse all files

46
flake.lock
View File

@ -23,21 +23,6 @@
"type": "github"
}
},
"catppuccin": {
"locked": {
"lastModified": 1734057772,
"narHash": "sha256-waF/2Y39JXJ4kG3zawmw1J1GxPHopyoOkJKJhfJ7RBs=",
"owner": "catppuccin",
"repo": "nix",
"rev": "20b6328df20ae45752c81311d225fd47cba32483",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"crane": {
"locked": {
"lastModified": 1730652660,
@ -180,11 +165,11 @@
]
},
"locked": {
"lastModified": 1734093295,
"narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
"lastModified": 1734344598,
"narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
"rev": "83ecd50915a09dca928971139d3a102377a8d242",
"type": "github"
},
"original": {
@ -237,11 +222,11 @@
]
},
"locked": {
"lastModified": 1734162608,
"narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=",
"lastModified": 1734591594,
"narHash": "sha256-7Q4hXE+b9A4DebZ5Q+q3WStuMiWR5bMW0ltpzbY/zMQ=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7",
"rev": "ce2abe494524cdb389a5d31c11c41834d4362ac5",
"type": "github"
},
"original": {
@ -322,11 +307,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1733861262,
"narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
"lastModified": 1734352517,
"narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
"rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
"type": "github"
},
"original": {
@ -338,11 +323,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1734017764,
"narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=",
"lastModified": 1734529975,
"narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b",
"rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
"type": "github"
},
"original": {
@ -370,11 +355,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1734119587,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github"
},
"original": {
@ -414,7 +399,6 @@
"root": {
"inputs": {
"agenix": "agenix",
"catppuccin": "catppuccin",
"home-manager": "home-manager_2",
"home-manager-unstable": "home-manager-unstable",
"impermanence": "impermanence",

8
flake.nix
View File

@ -47,18 +47,14 @@
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin = {
url = "github:catppuccin/nix";
};
};
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, catppuccin, ... }: # Function that tells my flake which to use and what do what to do with the dependencies.
outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: # Function that tells my flake which to use and what do what to do with the dependencies.
rec {
nixosConfigurations = ( # NixOS configurations
import ./hosts { # Imports ./hosts/default.nix
inherit (nixpkgs) lib;
inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote catppuccin; # Also inherit home-manager so it does not need to be defined here.
inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here.
nix.allowedUsers = [ "@wheel" ];
security.sudo.execWheelOnly = true;
}

22
hosts/default.nix
View File

@ -11,7 +11,7 @@
# └─ ./home.nix
#
{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, catppuccin, ... }:
{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }:
let
user = "kabbone";
@ -33,7 +33,7 @@ in
{
hades = lib.nixosSystem { # Desktop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote catppuccin; };
specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote; };
modules = [
agenix.nixosModules.default
microvm.nixosModules.host
@ -45,13 +45,12 @@ in
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-pc-ssd
catppuccin.nixosModules.catppuccin
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user catppuccin; };
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home.nix)] ++ [(import ./desktop/home.nix)];
};
@ -61,7 +60,7 @@ in
lifebook = lib.nixosSystem { # Laptop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote catppuccin; };
specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote; };
modules = [
agenix.nixosModules.default
lanzaboote.nixosModules.lanzaboote
@ -70,12 +69,11 @@ in
../modules/hardware/hydraCache.nix
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-ssd
catppuccin.nixosModules.catppuccin
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user catppuccin; };
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home.nix)] ++ [(import ./lifebook/home.nix)];
};
@ -85,7 +83,7 @@ in
nbf5 = lib.nixosSystem { # Laptop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix catppuccin; };
specialArgs = { inherit inputs user location nixos-hardware agenix; };
modules = [
agenix.nixosModules.default
./nbf5
@ -93,12 +91,11 @@ in
../modules/hardware/hydraCache.nix
nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc-ssd
catppuccin.nixosModules.catppuccin
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user catppuccin; };
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home.nix)] ++ [(import ./nbf5/home.nix)];
};
@ -108,7 +105,7 @@ in
steamdeck = nixpkgs-unstable.lib.nixosSystem { # steamdeck profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote catppuccin; };
specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; };
modules = [
agenix.nixosModules.default
jovian-nixos.nixosModules.default
@ -116,12 +113,11 @@ in
./steamdeck
./configuration_desktop.nix
../modules/hardware/hydraCache.nix
catppuccin.nixosModules.catppuccin
home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user catppuccin; };
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home.nix)] ++ [(import ./steamdeck/home.nix)];
};

41
hosts/home.nix
View File

@ -15,12 +15,11 @@
# └─ default.nix
#
{ config, lib, pkgs, user, catppuccin, ... }:
{ config, lib, pkgs, user, ... }:
#{ config, lib, pkgs, user, ... }:
{
imports =
[ catppuccin.homeManagerModules.catppuccin ] ++
(import ../modules/editors) ++
(import ../modules/programs) ++
(import ../modules/programs/configs) ++
@ -94,8 +93,6 @@
#ms-python.python
ms-vscode.cpptools
dracula-theme.theme-dracula
#catppuccin.catppuccin-vsc
#catppuccin.catppuccin-vsc-icons
];
})
@ -114,47 +111,11 @@
stateVersion = "23.05";
};
catppuccin = {
enable = false;
accent = "lavender";
flavor = "mocha";
pointerCursor.enable = true;
};
gtk.catppuccin = {
enable = true;
accent = "lavender";
flavor = "mocha";
icon = {
enable = true;
accent = "lavender";
flavor = "mocha";
};
};
qt.style.catppuccin = {
enable = true;
accent = "lavender";
flavor = "mocha";
apply = true;
};
programs = {
home-manager.enable = true;
alacritty = {
settings.font.size = 11;
catppuccin = {
enable = true;
flavor = "mocha";
};
};
btop = {
catppuccin = {
enable = true;
flavor = "mocha";
};
};
swaylock.catppuccin.enable = false;
};

1
modules/services/dunst.nix
View File

@ -27,7 +27,6 @@ in
services.dunst = {
enable = true;
catppuccin.enable = true;
settings = {
global = {
monitor = 0;

1
modules/wm/sway/home.nix
View File

@ -18,7 +18,6 @@
wayland.windowManager.sway = {
enable = true;
catppuccin.enable = true;
checkConfig = false;
config = rec {
menu = "${pkgs.rofi}/bin/rofi -show combi -show-icons";