diff --git a/common.nix b/common.nix index d64c4d4..266ede4 100644 --- a/common.nix +++ b/common.nix @@ -5,14 +5,14 @@ pkgs, lib, niri, - # lix-module, + lix-module, rs-programs, ... }: with lib; with builtins; { - # imports = [ lix-module.nixosModules.default ]; + imports = [ lix-module.nixosModules.default ]; environment = { systemPackages = with pkgs; [ @@ -76,19 +76,6 @@ with builtins; hardware.graphics.enable = true; - nixpkgs.overlays = [ - (final: prev: { - inherit (prev.lixPackageSets.stable) - nixpkgs-review - nix-eval-jobs - nix-fast-build - colmena - ; - }) - ]; - - nix.package = pkgs.lixPackageSets.stable.lix; - services = { systemd-lock-handler.enable = true; openssh = { @@ -121,12 +108,6 @@ with builtins; services.chrony = { enable = true; enableNTS = true; - servers = [ - "0.de.pool.ntp.org" - "1.de.pool.ntp.org" - "2.de.pool.ntp.org" - "3.de.pool.ntp.org" - ]; serverOption = "offline"; extraFlags = [ "-s" ]; extraConfig = "makestep 1 -1"; diff --git a/flake.lock b/flake.lock index 898e98f..1e79c88 100644 --- a/flake.lock +++ b/flake.lock @@ -228,6 +228,39 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -283,6 +316,43 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1763408228, + "narHash": "sha256-5zdqDsaVKHheZQyLEUgmH3J6YO7V53HAEj+BkzO0Cd4=", + "rev": "7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d.tar.gz?rev=7d46e9db7ec1fa02f3b1b9a7dc24fbc43e7b821d" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1761960361, + "narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=", + "rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c47f62187601ea2991b79a9bacdbfdf76cd29fbe.tar.gz?rev=c47f62187601ea2991b79a9bacdbfdf76cd29fbe" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -555,6 +625,8 @@ "crane": "crane", "fenix": "fenix", "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "niri": "niri", "nixcord": "nixcord", "nixos-hardware": "nixos-hardware", @@ -622,7 +694,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -673,6 +745,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -761,7 +848,7 @@ "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_5", "rust-manifest": "rust-manifest", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1739736913, diff --git a/flake.nix b/flake.nix index 51295e0..a68902f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,23 @@ typst-within.url = "github:schrottkatze/typst"; crane.url = "github:ipetkov/crane"; nixcord.url = "github:kaylorben/nixcord"; + # lix-module = { + # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + + # url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + # + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + flake = false; + }; + + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,6 +43,7 @@ nixpkgs, nixpkgs-stable, nixpkgs-unstable-small, + lix-module, typst-within, home-manager, nixos-hardware, @@ -72,6 +90,7 @@ pkgs-unstable-small pkgs-stable rs-programs + lix-module niri ; }; @@ -110,6 +129,7 @@ pkgs-unstable-small pkgs-stable rs-programs + lix-module niri ; }; diff --git a/hosts/denkbrett/hardware-configuration.nix b/hosts/denkbrett/hardware-configuration.nix index e37a94d..800ddc9 100644 --- a/hosts/denkbrett/hardware-configuration.nix +++ b/hosts/denkbrett/hardware-configuration.nix @@ -1,74 +1,45 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci_renesas" - "xhci_pci" - "rtsx_pci_sdmmc" - ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci_renesas" "xhci_pci" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ - "subvol=@" - "compress=zstd:3" - ]; - }; + fileSystems."/" = + { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; - boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = - "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fileSystems."/swap" = { - device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ - "subvol=@/@swap" - "noatime" - ]; - }; + fileSystems."/swap" = + { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ "subvol=@/@swap" ]; + }; - fileSystems."/home" = { - device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; - fsType = "btrfs"; - options = [ - "subvol=@home" - "compress=zstd:3" - ]; - }; + fileSystems."/home" = + { device = "/dev/mapper/luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/C6CA-5DE8"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/C6CA-5DE8"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [ - { - device = "/swap/swapfile"; - size = 1024 * 24; - } - ]; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/denkbrett/modules/graphics.nix b/hosts/denkbrett/modules/graphics.nix index 8251f77..3666bc9 100644 --- a/hosts/denkbrett/modules/graphics.nix +++ b/hosts/denkbrett/modules/graphics.nix @@ -15,7 +15,7 @@ intel-vaapi-driver intel-compute-runtime libvdpau-va-gl - mesa + mesa.drivers ]; }; } diff --git a/modules/desktop/dm.nix b/modules/desktop/dm.nix index 23edaaf..f4f3470 100644 --- a/modules/desktop/dm.nix +++ b/modules/desktop/dm.nix @@ -18,16 +18,18 @@ with lib; }; config.services = { displayManager = { - gdm = { - enable = true; - banner = "Meow :3"; - autoLogin.delay = cfg.autoLogin.delay; - }; autoLogin = { enable = cfg.autoLogin.enable; user = "jade"; }; defaultSession = "niri"; }; + xserver.displayManager.gdm = { + enable = true; + banner = "Meow :3"; + autoLogin = { + delay = cfg.autoLogin.delay; + }; + }; }; } diff --git a/modules/desktop/home/layaway.nix b/modules/desktop/home/layaway.nix index d82afa4..7687d3b 100644 --- a/modules/desktop/home/layaway.nix +++ b/modules/desktop/home/layaway.nix @@ -16,6 +16,7 @@ let hash = "sha256-SzAuVFEy56svasO3+1p6ysBRrIQd0UZX++/P4ZuwWm0="; }; + useFetchCargoVendor = true; cargoHash = "sha256-QVxlkE+sq4U048LnshI/tq6HInKiSgjQLAdR+27/wEI="; meta = with lib; { diff --git a/modules/desktop/home/niri/style.nix b/modules/desktop/home/niri/style.nix index d41414e..e9b0085 100644 --- a/modules/desktop/home/niri/style.nix +++ b/modules/desktop/home/niri/style.nix @@ -10,12 +10,11 @@ hide-after-inactive-ms = 10000; }; - # animations.window-open = { - # kind = "easing"; - # curve = "linear"; - # duration-ms = 230; - # }; - # animations.window-open.custom-shader = builtins.readFile ./shaders/glitch-open.frag; + animations.window-open.easing = { + curve = "linear"; + duration-ms = 230; + }; + animations.shaders.window-open = builtins.readFile ./shaders/glitch-open.frag; layout = { gaps = 15; # :GAPS:- gaps = %GAPS%;-:# diff --git a/modules/editors/helix/binds.nix b/modules/editors/helix/binds.nix index f25b9ac..26b00b2 100644 --- a/modules/editors/helix/binds.nix +++ b/modules/editors/helix/binds.nix @@ -11,11 +11,6 @@ S-tab = "move_parent_node_start"; A-S = "@S[\\s]+"; "'" = { - E = "@ D%sev ERROR "; - e = "@ d%sev ERROR "; - W = "@ D%sev WARN "; - w = "@ d%sev WARN "; - D = "@sgd"; F = "@sgy"; d = "@vgd"; diff --git a/modules/input/evremap.nix b/modules/input/evremap.nix index 8f13d89..1c37c7e 100644 --- a/modules/input/evremap.nix +++ b/modules/input/evremap.nix @@ -15,6 +15,7 @@ let rev = "4480c4eda223b98899b0fbd926bc34f7bd0e1a18"; sha256 = "sha256-BxSrphgW1n465FX6bKVkq6O0XE2JqanfSYlsGwWUWkQ="; }; + useFetchCargoVendor = true; cargoHash = "sha256-O1rJ48m8Q7kZABw/UNpmUT7FFBWQedo6CuV+NX9kDt8="; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libevdev ]; diff --git a/modules/shell/git.nix b/modules/shell/git.nix index f0315df..52a2e40 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -14,11 +14,15 @@ { programs.git = { enable = true; - settings = { - user = { - name = "Schrottkatze"; - email = "git@schrottkatze.de"; - }; + userName = "Schrottkatze"; + userEmail = "git@schrottkatze.de"; + aliases = { + a = "add"; + c = "commit"; + ca = "commit --all"; + p = "push"; + pl = "pull"; + s = "status"; }; signing = { format = "ssh";