update and drop catppuccin

This commit is contained in:
2025-09-19 15:12:01 +02:00
parent a6871f94a8
commit 6c4c3d54aa
8 changed files with 41 additions and 55 deletions

49
flake.lock generated
View File

@@ -1,23 +1,5 @@
{
"nodes": {
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1751880463,
"narHash": "sha256-aSQllMKqsTYAUp4yhpspZn0Hj5yIj7Mh4UD5iyk5iMM=",
"owner": "catppuccin",
"repo": "nix",
"rev": "9474347c69e93e392f194dda7a57c641ba4b998e",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -25,11 +7,11 @@
]
},
"locked": {
"lastModified": 1751810233,
"narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
"lastModified": 1757808926,
"narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
"rev": "f21d9167782c086a33ad53e2311854a8f13c281e",
"type": "github"
},
"original": {
@@ -41,27 +23,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1750776420,
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
"lastModified": 1758070117,
"narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1751741127,
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29e290002bfff26af1db6f64d070698019460302",
"rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
"type": "github"
},
"original": {
@@ -73,9 +39,8 @@
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
}
}
},

View File

@@ -4,8 +4,6 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
catppuccin.url = "github:catppuccin/nix";
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
@@ -13,27 +11,27 @@
};
outputs = inputs@{ self, nixpkgs, catppuccin, home-manager, ... }: {
outputs = inputs@{ self, nixpkgs, # catppuccin,
home-manager, ... }: {
nixosConfigurations = {
segfault-machine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
specialArgs = { inherit inputs; };
modules = [
./hosts/segfault-machine/configuration.nix
home-manager.nixosModules.home-manager
{
home-manager.nixosModules.home-manager {
home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.lukas.imports = [
./home/lukas/default.nix
];
./home/lukas/default.nix
];
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.extraSpecialArgs = { inherit inputs; };
}
];

View File

@@ -13,8 +13,6 @@
accent = "mauve";
};
gtk.enable = true;
waybar.enable = false;
rofi.enable = false;
};

View File

@@ -1,7 +1,7 @@
{
imports = [
./brave.nix
./catppuccin.nix
# ./catppuccin.nix
./direnv.nix
./emacs.nix
./git.nix

View File

@@ -22,6 +22,14 @@
"XCURSOR_SIZE,32"
];
#windowrulev2 = [
# do not let scenbuilder take focus
# "nofocus, title:^(.*java.*)$"
#];
monitor = [
", highres, auto, 1"
];
@@ -35,6 +43,8 @@
force_zero_scaling = true;
};
# windowrule = "stayfocused,^(com.oracle.javafx.scenebuilder.app.SceneBuilderApp)$";
bind = [
@@ -47,6 +57,8 @@
# lock screen
"$mod, L, exec, hyprlock"
"$mod, S, togglefloating"
# emacs
"$mod, e, exec, emacs"

View File

@@ -16,8 +16,12 @@
pkgs.wget
pkgs.unzip
pkgs.feather
pkgs.electrum
pkgs.zathura
pkgs.xfce.thunar
pkgs.ranger
pkgs.nerd-fonts.fira-code
pkgs.fira-code
@@ -32,6 +36,8 @@
pkgs.binutils
pkgs.gcc
pkgs.scenebuilder
pkgs.nil
pkgs.quickemu

View File

@@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
imports = [
./hardware.nix
../../users/lukas.nix
@@ -12,6 +13,7 @@
../../modules/system/docker.nix
../../modules/system/gpg.nix
../../modules/system/virtualbox.nix
../../modules/system/mullvad.nix
];
networking.hostName = "segfault-machine";

View File

@@ -0,0 +1,5 @@
{ pkgs, ... }:
{
services.mullvad-vpn.package = pkgs.mullvad-vpn;
services.mullvad-vpn.enable = true;
}