From 6c4c3d54aa1f31934ab2785d8a706e9065be0519 Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 19 Sep 2025 15:12:01 +0200 Subject: [PATCH] update and drop catppuccin --- flake.lock | 49 ++++-------------------- flake.nix | 16 ++++---- home/lukas/catppuccin.nix | 2 - home/lukas/default.nix | 2 +- home/lukas/hyprland.nix | 12 ++++++ home/lukas/packages.nix | 6 +++ hosts/segfault-machine/configuration.nix | 4 +- modules/system/mullvad.nix | 5 +++ 8 files changed, 41 insertions(+), 55 deletions(-) create mode 100644 modules/system/mullvad.nix diff --git a/flake.lock b/flake.lock index b629885..1bc83e1 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } } }, diff --git a/flake.nix b/flake.nix index df56253..fba84f6 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; } ]; diff --git a/home/lukas/catppuccin.nix b/home/lukas/catppuccin.nix index bd532b9..250f692 100644 --- a/home/lukas/catppuccin.nix +++ b/home/lukas/catppuccin.nix @@ -13,8 +13,6 @@ accent = "mauve"; }; - gtk.enable = true; - waybar.enable = false; rofi.enable = false; }; diff --git a/home/lukas/default.nix b/home/lukas/default.nix index 9e7aa14..a66f046 100644 --- a/home/lukas/default.nix +++ b/home/lukas/default.nix @@ -1,7 +1,7 @@ { imports = [ ./brave.nix - ./catppuccin.nix + # ./catppuccin.nix ./direnv.nix ./emacs.nix ./git.nix diff --git a/home/lukas/hyprland.nix b/home/lukas/hyprland.nix index e0b22ee..02fe3ab 100644 --- a/home/lukas/hyprland.nix +++ b/home/lukas/hyprland.nix @@ -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" diff --git a/home/lukas/packages.nix b/home/lukas/packages.nix index df7214d..18bbdbc 100644 --- a/home/lukas/packages.nix +++ b/home/lukas/packages.nix @@ -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 diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix index f0437f2..d1cda11 100644 --- a/hosts/segfault-machine/configuration.nix +++ b/hosts/segfault-machine/configuration.nix @@ -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"; diff --git a/modules/system/mullvad.nix b/modules/system/mullvad.nix new file mode 100644 index 0000000..ec84025 --- /dev/null +++ b/modules/system/mullvad.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: +{ + services.mullvad-vpn.package = pkgs.mullvad-vpn; + services.mullvad-vpn.enable = true; +}