Go back to stable nixpkgs and i3

I hereby declare bancruptcy :(
This commit is contained in:
Julian Mutter 2024-10-06 18:24:16 +02:00
parent 2572513c44
commit d683f1f574
10 changed files with 48 additions and 31 deletions

33
flake.lock generated
View File

@ -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",

View File

@ -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";

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 = {

View File

@ -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;