From d683f1f574477891a66bd6399946cc0179711884 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Sun, 6 Oct 2024 18:24:16 +0200 Subject: [PATCH] Go back to stable nixpkgs and i3 I hereby declare bancruptcy :( --- flake.lock | 33 ++++++++++++++----- flake.nix | 6 ++-- homes/x86_64-linux/julian@aspi/default.nix | 8 ++--- homes/x86_64-linux/julian@aspi/packages.nix | 6 ++-- .../x86_64-linux/julian@kardorf/packages.nix | 6 ++-- modules/home/kitty/default.nix | 2 +- modules/nixos/i3/default.nix | 1 + systems/x86_64-linux/aspi/default.nix | 13 ++++---- systems/x86_64-linux/kardorf/default.nix | 2 +- systems/x86_64-linux/pianonix/default.nix | 2 +- 10 files changed, 48 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index aaf243b..c0e14cc 100644 --- a/flake.lock +++ b/flake.lock @@ -237,15 +237,16 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -287,9 +288,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "systems": "systems", "xdph": "xdph" }, @@ -557,13 +556,13 @@ "locked": { "lastModified": 1728018373, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -648,6 +647,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -686,7 +701,7 @@ "nix-ld": "nix-ld", "nix-matlab": "nix-matlab", "nix-topology": "nix-topology", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "snowfall-lib": "snowfall-lib", diff --git a/flake.nix b/flake.nix index 2d644c8..85b6dc7 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,10 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs = nixpkgs-unstable; + nixpkgs = nixpkgs-stable; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -34,7 +34,7 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; + # hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; diff --git a/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix index 2ecae73..642ba17 100644 --- a/homes/x86_64-linux/julian@aspi/default.nix +++ b/homes/x86_64-linux/julian@aspi/default.nix @@ -32,14 +32,14 @@ }; topgrade.enable = true; neovim.enable = true; - kitty.enable = true; - # wezterm.enable = true; + # kitty.enable = true; + wezterm.enable = true; yazi.enable = true; emacs.enable = true; - # i3.enable = true; + i3.enable = true; - hyprland.enable = true; + # hyprland.enable = true; nix-helper.enable = true; desktop.enable = true; diff --git a/homes/x86_64-linux/julian@aspi/packages.nix b/homes/x86_64-linux/julian@aspi/packages.nix index d623b88..1af5984 100644 --- a/homes/x86_64-linux/julian@aspi/packages.nix +++ b/homes/x86_64-linux/julian@aspi/packages.nix @@ -10,7 +10,7 @@ with pkgs; # makemkv audacity - cheese + gnome.cheese zoom-us qutebrowser @@ -68,8 +68,8 @@ with pkgs; usbutils # lsusb pciutils # lspci - gnome-keyring - seahorse + gnome.gnome-keyring + gnome.seahorse polkit_gnome nix-index python3 diff --git a/homes/x86_64-linux/julian@kardorf/packages.nix b/homes/x86_64-linux/julian@kardorf/packages.nix index 0ad12de..492a2c2 100644 --- a/homes/x86_64-linux/julian@kardorf/packages.nix +++ b/homes/x86_64-linux/julian@kardorf/packages.nix @@ -18,7 +18,7 @@ with pkgs; # makemkv audacity - cheese + gnome.cheese zoom-us qutebrowser @@ -83,8 +83,8 @@ with pkgs; usbutils # lsusb pciutils # lspci - gnome-keyring - seahorse + gnome.gnome-keyring + gnome.seahorse polkit_gnome nix-index python3 diff --git a/modules/home/kitty/default.nix b/modules/home/kitty/default.nix index a67a2e8..aa9d4aa 100644 --- a/modules/home/kitty/default.nix +++ b/modules/home/kitty/default.nix @@ -31,7 +31,7 @@ in programs.kitty = { enable = true; shellIntegration.enableFishIntegration = true; - themeFile = "Catppuccin-Mocha"; + theme = "Catppuccin-Mocha"; settings = { enable_audio_bell = false; confirm_os_window_close = 0; # no ask on quit diff --git a/modules/nixos/i3/default.nix b/modules/nixos/i3/default.nix index 14771db..7fa204a 100644 --- a/modules/nixos/i3/default.nix +++ b/modules/nixos/i3/default.nix @@ -31,6 +31,7 @@ in config = lib.mkIf cfg.enable { services.xserver.windowManager.i3.enable = true; services.xserver.windowManager.i3.package = pkgs.i3-gaps; + services.displayManager.defaultSession = "none+i3"; programs.xss-lock = { # responds to "loginctl lock-session" via dbus diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix index 95c940c..16ffdf1 100644 --- a/systems/x86_64-linux/aspi/default.nix +++ b/systems/x86_64-linux/aspi/default.nix @@ -74,12 +74,12 @@ # thunar.enable = true; pcmanfm.enable = true; - # i3.enable = true; - # gdm.enable = true; + i3.enable = true; + gdm.enable = true; - wayland.enable = true; - hyprland.enable = true; - tuigreet.enable = true; + # wayland.enable = true; + # hyprland.enable = true; + # tuigreet.enable = true; }; nix.settings.auto-optimise-store = true; @@ -101,7 +101,7 @@ ]; }; - hardware.graphics.enable = true; + hardware.opengl.enable = true; services.xserver.wacom.enable = true; @@ -157,6 +157,7 @@ }; # Sound + sound.enable = true; hardware.pulseaudio.enable = false; # needed on aspi for audio to work properly diff --git a/systems/x86_64-linux/kardorf/default.nix b/systems/x86_64-linux/kardorf/default.nix index ca454ae..01facde 100644 --- a/systems/x86_64-linux/kardorf/default.nix +++ b/systems/x86_64-linux/kardorf/default.nix @@ -95,7 +95,7 @@ services.xserver.enable = true; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; - hardware.graphics.enable = true; + hardware.opengl.enable = true; # hardware.nvidia.modesetting.enable = true; # for wayland nix.gc = { diff --git a/systems/x86_64-linux/pianonix/default.nix b/systems/x86_64-linux/pianonix/default.nix index e7317a8..29a6a85 100644 --- a/systems/x86_64-linux/pianonix/default.nix +++ b/systems/x86_64-linux/pianonix/default.nix @@ -51,7 +51,7 @@ # Enable the X11 windowing system. services.xserver.enable = true; - hardware.graphics.enable = true; + hardware.opengl.enable = true; nix.gc = { automatic = true;