diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index 949d11a..83b556c 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -6,95 +6,98 @@ __findFile, lib, ... -}: { +}: +{ den.aspects.desktop = { includes = [ modules.nix ]; - nixos = { - pkgs, - config, - ... - }: { - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.devices = [ - "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F" - "nodev" - ]; - #boot.loader.efi.canTouchEfiVariables = true; - boot.loader.grub.efiSupport = true; - boot.loader.grub.efiInstallAsRemovable = true; - networking.hostName = "doloroo-main"; # Define your hostname. + nixos = + { + pkgs, + config, + ... + }: + { + boot.loader.grub.enable = true; + boot.loader.grub.device = "nodev"; + boot.loader.grub.devices = [ + "/dev/disk/by-id/nvme-CT1000P2SSD8_2221E632CD1F" + "nodev" + ]; + #boot.loader.efi.canTouchEfiVariables = true; + boot.loader.grub.efiSupport = true; + boot.loader.grub.efiInstallAsRemovable = true; + networking.hostName = "doloroo-main"; # Define your hostname. - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; - boot.initrd.verbose = false; - boot.kernelParams = [ - "boot.shell_on_fail" - "rd.systemd.show_status=auto" - ]; + boot.initrd.verbose = false; + boot.kernelParams = [ + "boot.shell_on_fail" + "rd.systemd.show_status=auto" + ]; - services.openssh.enable = true; + services.openssh.enable = true; - networking.networkmanager.enable = true; - networking.firewall.enable = false; + networking.networkmanager.enable = true; + networking.firewall.enable = false; - security.rtkit.enable = true; + security.rtkit.enable = true; - hardware.graphics = { - enable = true; - }; + hardware.graphics = { + enable = true; + }; - services.xserver.videoDrivers = ["nvidia"]; + services.xserver.videoDrivers = [ "nvidia" ]; - fileSystems."/mnt/2tb" = { - device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2"; - fsType = "ext4"; - options = [ - # If you don't have this options attribute, it'll default to "defaults" - # boot options for fstab. Search up fstab mount options you can use - "defaults" - "users" # Allows any user to mount and unmount - "nofail" # Prevent system from failing if this drive doesn't mount - "exec" + fileSystems."/mnt/2tb" = { + device = "/dev/disk/by-uuid/0f49aec7-4af2-4f4f-b475-3f4fad2b59c2"; + fsType = "ext4"; + options = [ + # If you don't have this options attribute, it'll default to "defaults" + # boot options for fstab. Search up fstab mount options you can use + "defaults" + "users" # Allows any user to mount and unmount + "nofail" # Prevent system from failing if this drive doesn't mount + "exec" + ]; + }; + services.gnome.gnome-keyring.enable = true; + + hardware.nvidia = { + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + # prime.offload.enable = true; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + open = false; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + boot.binfmt.emulatedSystems = [ + "aarch64-linux" ]; }; - services.gnome.gnome-keyring.enable = true; - - hardware.nvidia = { - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; - # prime.offload.enable = true; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; - boot.binfmt.emulatedSystems = [ - "aarch64-linux" - ]; - }; }; } diff --git a/config/modules/hyprland/doloro-settings.nix b/config/modules/hyprland/doloro-settings.nix index ad92492..5179e5f 100644 --- a/config/modules/hyprland/doloro-settings.nix +++ b/config/modules/hyprland/doloro-settings.nix @@ -1,116 +1,134 @@ -{modules, ...}: { +{ modules, ... }: +{ modules.hyprland = { provides = { doloro-settings = { includes = [ modules.dunst ]; - homeManager = { - pkgs, - home, - ... - }: { - home.packages = [ - pkgs.hyprcursor - pkgs.wlogout - pkgs.tofi - pkgs.killall - pkgs.grim - pkgs.slurp - pkgs.wayclip - ]; - home.pointerCursor = { - enable = true; - name = "rose-pine-hyprcursor"; - package = pkgs.rose-pine-hyprcursor; - hyprcursor.enable = true; - }; - wayland.windowManager.hyprland.settings = { - env = [ - "XCURSOR_THEME,BreezeX-RosePine-Linux" - "XCURSOR_SIZE,24" - "HYPRCURSOR_SIZE,24" - "__GLX_VENDOR_LIBRARY_NAME,nvidia" - "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom + homeManager = + { + pkgs, + home, + ... + }: + { + home.packages = [ + pkgs.hyprcursor + pkgs.wlogout + pkgs.tofi + pkgs.killall + pkgs.grim + pkgs.slurp + pkgs.wayclip ]; - general = { - gaps_in = 1; - gaps_out = 1; - border_size = 1; - # "col.active_border" = - # "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})"; - # "col.inactive_border" = - # "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})"; - resize_on_border = false; - allow_tearing = true; - layout = "dwindle"; + home.pointerCursor = { + enable = true; + name = "rose-pine-hyprcursor"; + package = pkgs.rose-pine-hyprcursor; + hyprcursor.enable = true; }; - decoration = { - rounding = 4; - rounding_power = 1; - active_opacity = 1.0; - inactive_opacity = 1.0; - - shadow = { - enabled = false; + services.hyprpaper = { + enable = true; + settings = { + splash = true; + wallpaper = [ + { + monitor = "HDMI-A-1"; + path = "/home/doloro/Wallpaper.jpg"; + } + { + monitor = "DP-2"; + path = "/home/doloro/Wallpaper.jpg"; + } + ]; }; + }; + wayland.windowManager.hyprland.settings = { + env = [ + "XCURSOR_THEME,BreezeX-RosePine-Linux" + "XCURSOR_SIZE,24" + "HYPRCURSOR_SIZE,24" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" + "WEBKIT_DISABLE_DMABUF_RENDERER,1" # maybe disable if nixos fixes alcom + ]; + general = { + gaps_in = 1; + gaps_out = 1; + border_size = 1; + # "col.active_border" = + # "rgb(${toString base16.rgb."base06".r},${toString base16.rgb."base06".g},${toString base16.rgb."base06".b})"; + # "col.inactive_border" = + # "rgb(${toString base16.rgb."base03".r},${toString base16.rgb."base03".g},${toString base16.rgb."base03".b})"; + resize_on_border = false; + allow_tearing = true; + layout = "dwindle"; + }; + decoration = { + rounding = 4; + rounding_power = 1; + active_opacity = 1.0; + inactive_opacity = 1.0; - blur = { + shadow = { + enabled = false; + }; + + blur = { + enabled = true; + passes = 1; + new_optimizations = true; + ignore_opacity = false; + }; + }; + cursor = { + no_hardware_cursors = false; + }; + animations = { enabled = true; - passes = 1; - new_optimizations = true; - ignore_opacity = false; + bezier = [ + "easeOutQuint,0.23,1,0.32,1" + "easeInOutCubic,0.65,0.05,0.36,1" + "linear,0,0,1,1" + "almostLinear,0.5,0.5,0.75,1.0" + "quick,0.15,0,0.1,1" + ]; + animation = [ + "global, 1, 10, default" + "border, 1, 5.39, easeOutQuint" + "windows, 1, 2.79, easeOutQuint" + "windowsIn, 1, 1, easeOutQuint, popin 87%" + "windowsOut, 1, 1, linear, popin 87%" + "windowsMove, 1, 1, easeInOutCubic" + "fadeIn, 1, 0.5, almostLinear" + "fadeOut, 1, 0.5, almostLinear" + "fade, 1, 1, quick" + "layers, 1, 3.81, easeOutQuint" + "layersIn, 1, 4, easeOutQuint, fade" + "layersOut, 1, 1.5, linear, fade" + "fadeLayersIn, 1, 1.79, almostLinear" + "fadeLayersOut, 1, 1.39, almostLinear" + "workspaces, 1, 1, almostLinear, slide" + "workspacesIn, 1, 1, easeInOutCubic, slide" + "workspacesOut, 1, 1, easeInOutCubic, slide" + "zoomFactor, 1, 7, quick" + ]; }; - }; - cursor = { - no_hardware_cursors = false; - }; - animations = { - enabled = true; - bezier = [ - "easeOutQuint,0.23,1,0.32,1" - "easeInOutCubic,0.65,0.05,0.36,1" - "linear,0,0,1,1" - "almostLinear,0.5,0.5,0.75,1.0" - "quick,0.15,0,0.1,1" - ]; - animation = [ - "global, 1, 10, default" - "border, 1, 5.39, easeOutQuint" - "windows, 1, 2.79, easeOutQuint" - "windowsIn, 1, 1, easeOutQuint, popin 87%" - "windowsOut, 1, 1, linear, popin 87%" - "windowsMove, 1, 1, easeInOutCubic" - "fadeIn, 1, 0.5, almostLinear" - "fadeOut, 1, 0.5, almostLinear" - "fade, 1, 1, quick" - "layers, 1, 3.81, easeOutQuint" - "layersIn, 1, 4, easeOutQuint, fade" - "layersOut, 1, 1.5, linear, fade" - "fadeLayersIn, 1, 1.79, almostLinear" - "fadeLayersOut, 1, 1.39, almostLinear" - "workspaces, 1, 1, almostLinear, slide" - "workspacesIn, 1, 1, easeInOutCubic, slide" - "workspacesOut, 1, 1, easeInOutCubic, slide" - "zoomFactor, 1, 7, quick" - ]; - }; - dwindle = { - # pseudotile = true; - preserve_split = true; - }; - # master = { - # new_status = master; - # }; - misc = { - force_default_wallpaper = -1; - disable_hyprland_logo = false; - enable_anr_dialog = false; - # vfr = true; - }; - "$mainMod" = "SUPER"; - bind = - [ + dwindle = { + # pseudotile = true; + preserve_split = true; + }; + # master = { + # new_status = master; + # }; + misc = { + force_default_wallpaper = -1; + disable_hyprland_logo = false; + enable_anr_dialog = false; + # vfr = true; + }; + "$mainMod" = "SUPER"; + bind = [ ( let config = pkgs.writeTextFile { @@ -131,7 +149,8 @@ script = pkgs.writeShellScript "mreow" '' exec $(tofi-drun -c ${config}) ''; - in "$mainMod, R, exec, ${script}" + in + "$mainMod, R, exec, ${script}" ) "$mainMod, C, killactive" "$mainMod, M, exec, uwsm stop" @@ -150,7 +169,7 @@ fish -c 'grim -g $(slurp) -t png - &| wl-copy -t image/png; killall wayfreeze' ''; in - "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'" + "$mainMod, S, exec, " + "wayfreeze --after-freeze-cmd '${script}'" ) "$mainMod, F, fullscreen" "$mainMod, mouse_down, workspace, e+1" @@ -163,40 +182,41 @@ ] ++ (builtins.concatLists ( builtins.genList ( - i: let + i: + let ws = i + 1; - in [ + in + [ "$mainMod, ${toString ws}, workspace, ${toString ws}" "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}" ] - ) - 9 + ) 9 )); - bindm = [ - "$mainMod, mouse:272, movewindow" - "$mainMod, mouse:273, resizewindow" - ]; - windowrule = [ - "match:class .*, suppress_event maximize" - "match:class ^(gamescope)$, workspace 5" - "match:class ^(gamescope)$, immediate true" - "match:class ^(gamescope)$, confine_pointer true" - "match:class ^(steam)$, workspace 6 silent" - "match:class ^(vesktop)$, workspace 8 silent" - "match:class ^(org.telegram.desktop)$, workspace 8 silent" - "match:class ^(com.obsproject.Studio)$, workspace 10 silent" - "match:initial_title ^(OBS Studio Crash Detected)$, pin true" - "match:initial_title ^(Discord Popout)$, workspace 1 silent" - ]; - layerrule = [ - "match:namespace ^(notifications)$, no_screen_share true" - # "match:namespace ^(quickshell)$, blur true" - ]; - # exec-once = [ - # ]; - # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs + bindm = [ + "$mainMod, mouse:272, movewindow" + "$mainMod, mouse:273, resizewindow" + ]; + windowrule = [ + "match:class .*, suppress_event maximize" + "match:class ^(gamescope)$, workspace 5" + "match:class ^(gamescope)$, immediate true" + "match:class ^(gamescope)$, confine_pointer true" + "match:class ^(steam)$, workspace 6 silent" + "match:class ^(vesktop)$, workspace 8 silent" + "match:class ^(org.telegram.desktop)$, workspace 8 silent" + "match:class ^(com.obsproject.Studio)$, workspace 10 silent" + "match:initial_title ^(OBS Studio Crash Detected)$, pin true" + "match:initial_title ^(Discord Popout)$, workspace 1 silent" + ]; + layerrule = [ + "match:namespace ^(notifications)$, no_screen_share true" + # "match:namespace ^(quickshell)$, blur true" + ]; + # exec-once = [ + # ]; + # we need to auto launch: quickshell, steam, ar_rpc (maybe), vesktop, telegram, qbit, and obs + }; }; - }; }; }; }; diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 384c1c7..86e481b 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -10,7 +10,7 @@ flake-file.inputs = { nixvim = { url = "github:nix-community/nixvim"; - # inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; modules = { @@ -74,7 +74,7 @@ cmp_luasnip.enable = true; fidget.enable = true; mini-comment.enable = true; - cord.enable = true; + # cord.enable = true; todo-comments.enable = true; transparent.enable = true; which-key.enable = true; diff --git a/flake.lock b/flake.lock index 0e903ea..a1f29f7 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1781018471, - "narHash": "sha256-jQHNMqg2+Iey/WnF+RNvEs+HG3HFVdCX5W/7wne3UIM=", + "lastModified": 1781455283, + "narHash": "sha256-/71qSmWc0vIyGsvtADG8/uHnC/NvXPEY6TXRoDMufeo=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "39d9d125940996ed2eb32425ffec7f2de6ac7fba", + "rev": "3bd5b77999c4180ed01bdd0669bfabc5171b090a", "type": "github" }, "original": { @@ -517,11 +517,11 @@ ] }, "locked": { - "lastModified": 1781365335, - "narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", + "lastModified": 1781615165, + "narHash": "sha256-CFF4fNNfr2GZSx1xJhBNBi7VMj8OtOqZGOV+fiBSbzw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", + "rev": "34dd288e65012954cf7170658e0e6a61255b0327", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1781437668, - "narHash": "sha256-UjNWFgYMIzUyvYwFEZPERVx8MnKexbO5Jpzi08i1LLo=", + "lastModified": 1781551294, + "narHash": "sha256-6cHkPGrQmd8RI/YdEgHmY3ebnPHHq07DxOxST70jYhI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c123867ebed53a3a429cadc8af79639d5af9304a", + "rev": "88262e1f860adc56f528ef68b2909ee33a27186b", "type": "github" }, "original": { @@ -929,11 +929,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1781234038, - "narHash": "sha256-jo4a47qDgsx1F1i0MtHZl12FfzqKJOES25vbm0ZUxeI=", + "lastModified": 1781610921, + "narHash": "sha256-PXyfDFGyW+UYteu3uHJgp49sFHRU16iocf5K2ltqn3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "eb5789cba8d37802d330df5a13c691622c83121f", + "rev": "e5857dc58304b3d5bbac6340820f7d4450688538", "type": "github" }, "original": { @@ -962,11 +962,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1780938415, - "narHash": "sha256-QHyIMGSbCQW8d5qbOrMsm6gem10bO3Au2YLa3alJfHo=", + "lastModified": 1781588278, + "narHash": "sha256-Fw/Zo0hwgn9ulgY5duQy51WHtqpNoLjNDZYLdEI1SS4=", "owner": "YaLTeR", "repo": "niri", - "rev": "6f1a2c5f0e8274223d4204b1f8d6f7f91538967e", + "rev": "fdb6d85fc78355762bcf3cf71fe4037681a766f9", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1781292859, - "narHash": "sha256-etlzg6/H1NuHGTnrxxhvdmhDYQls/AMHk1IrBbNc0WM=", + "lastModified": 1781463250, + "narHash": "sha256-gYE/0gtSedmA21UWRZ2DA+iXhySh1JGKOssuqejV7cQ=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "c57a7ab46f5e9b4eb32ed74ba6e7cd5bcd3a6e64", + "rev": "4039d20f1495f2c521e7d12723a0c45348b118e8", "type": "github" }, "original": { @@ -1133,11 +1133,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1780952837, - "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=", + "lastModified": 1781509190, + "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe", + "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "type": "github" }, "original": { @@ -1164,22 +1164,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1780336545, - "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -1195,7 +1179,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1745279238, "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", @@ -1211,7 +1195,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1781074563, "narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=", @@ -1287,11 +1271,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1781246015, - "narHash": "sha256-C3D5TBgght7LBaqm5oGNRf6CynGl5lGED4jcDw2ZOOk=", + "lastModified": 1781421111, + "narHash": "sha256-2xSTHlKBF5h/tgAeHyQPR/g48qk9ACz7dED3jc3pGKA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7bd229cbe77d7746d64a1e8c1a6f6cc08f606fc4", + "rev": "7fe8f446d9475534dc54591ccb5c87c1ce6eaf8b", "type": "github" }, "original": { @@ -1349,15 +1333,17 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_11", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_4" }, "locked": { - "lastModified": 1781388258, - "narHash": "sha256-Kx1zxra9sZ215H3OiWUfkulu8N2v3iu19wqlzpD/Ac0=", + "lastModified": 1781713417, + "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "e3c908fdf6dff268b04ffb6758bcfc7c018489b9", + "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7", "type": "github" }, "original": { @@ -1393,14 +1379,14 @@ }, "omp-nix": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1781370169, - "narHash": "sha256-8YdyF3+nfzquZdChx555IFW+X34QYxNShJbK2NPruFw=", + "lastModified": 1781618766, + "narHash": "sha256-4PFt9cI8ZeBTwd0vOmf6NGES+AwkEcigjbWq3TgjtdY=", "ref": "main", - "rev": "261e7137ce1b84bad5eb51a8302050b0710f2af2", - "revCount": 166, + "rev": "cb27b28f71d5c86d950b055fa12037beab343423", + "revCount": 187, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1437,7 +1423,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -1595,7 +1581,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "systems": "systems_5" }, "locked": { @@ -1841,11 +1827,11 @@ }, "x1e-kernel": { "locked": { - "lastModified": 1780078420, - "narHash": "sha256-ZQ2gZRcE227EhG8YrEHnWkSbw5Wgd5IckLmpEV2SkN8=", + "lastModified": 1781581349, + "narHash": "sha256-KCKvmmFhLVrUQ10qUfPPam7nTvriMrlVPHeo2Ey0CO8=", "ref": "refs/heads/main", - "rev": "931cf9966ba3a213946329ce95b07635a34cd839", - "revCount": 6, + "rev": "30c7f18e474fe8b6584600946c1fe9f688def838", + "revCount": 7, "type": "git", "url": "https://git.scug.io/nikkuss/x1e-nixos.git" }, diff --git a/flake.nix b/flake.nix index 0874f08..a19e3a5 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,10 @@ nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixvim.url = "github:nix-community/nixvim"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix"; sops-nix = {