diff --git a/config/hosts/aspects/doloro-desktop/home.nix b/config/hosts/aspects/doloro-desktop/home.nix index 13eff77..2d30104 100644 --- a/config/hosts/aspects/doloro-desktop/home.nix +++ b/config/hosts/aspects/doloro-desktop/home.nix @@ -4,8 +4,7 @@ modules, inputs, ... -}: -{ +}: { den.aspects.doloro-desktop = { includes = [ @@ -38,49 +37,64 @@ modules.podman ]; - nixos = - { config, pkgs, ... }: - { - users.users.doloro = { - shell = pkgs.fish; - hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; - extraGroups = [ "libvirtd" ]; - }; - virtualisation.libvirtd.enable = true; - programs.virt-manager.enable = true; + nixos = { + config, + pkgs, + ... + }: { + users.users.doloro = { + shell = pkgs.fish; + hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; + extraGroups = ["libvirtd"]; }; - homeManager = - { home, pkgs, ... }: - { - wayland.windowManager.hyprland.settings = { - monitor = [ - "HDMI-A-1, 1920x1080@60, 0x0, 1" - "DP-3, 1920x1080@144, 1920x0, 1" - ]; - exec-once = [ - "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor - ]; - workspace = [ - "name:2, monitor:DP-3" - ]; - input = { - kb_layout = "gb"; - follow_mouse = 2; - sensitivity = -0.5; - }; - }; - home.packages = with pkgs; [ - equibop - telegram-desktop - obsidian - # pear-desktop - prismlauncher - deadlock-mod-manager - gamescope - android-studio + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + }; + homeManager = { + home, + pkgs, + ... + }: { + wayland.windowManager.hyprland.settings = { + monitor = [ + "HDMI-A-1, 1920x1080@60, 0x0, 1" + "DP-3, 1920x1080@144, 1920x0, 1" ]; - nixpkgs.config.allowUnfree = true; - programs.home-manager.enable = true; + exec-once = [ + "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor + ]; + workspace = [ + "name:2, monitor:DP-3" + ]; + input = { + kb_layout = "gb"; + follow_mouse = 2; + sensitivity = -0.5; + }; }; + home.packages = with pkgs; [ + equibop + telegram-desktop + obsidian + # pear-desktop + prismlauncher + deadlock-mod-manager + gamescope + android-studio + blender + ]; + programs.lutris.enable = true; + nixpkgs.overlays = [ + # Skipping tests while upstream sorts it out, revert once + # Hydra consistently builds openldap green. + (final: prev: { + openldap = prev.openldap.overrideAttrs (_: { + doCheck = false; + }); + }) + ]; + nixpkgs.config.allowUnfree = true; + programs.home-manager.enable = true; + }; }; } diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index 331a8b0..9c0497a 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -46,9 +46,9 @@ rustfmt # misc ripgrep - # misc nixd tree-sitter + rust-analyzer ]; performance.byteCompileLua = { enable = true; @@ -106,6 +106,15 @@ }; nixd = { enable = true; + settings = { + nixd = { + nixpkgs.expr = "import (builtins.getFlake \"${toString /home/doloro/dotfiles}\").inputs.nixpkgs { }"; + options = { + nixos.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").nixosConfigurations.desktop.options"; + home_manager.expr = "(builtins.getFlake \"${toString /home/doloro/dotfiles}\").homeConfigurations.doloro-desktop.options"; + }; + }; + }; }; astro = { enable = true; diff --git a/flake.lock b/flake.lock index ea3b372..6746fba 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1778649404, - "narHash": "sha256-LwRT4Wn48IPn674TMnrckayCioF0iMGYqE7bi/256/k=", + "lastModified": 1778851262, + "narHash": "sha256-lEtNQQdQkC1bWIxBr9po1cW6aD+UzAMxUbe6k3hH1tA=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "6544eeb1694d6790292156dc300f149d14bc5210", + "rev": "e625438b981d774a22e2ba431a2d93e1737462ff", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1778649239, - "narHash": "sha256-dNaGAK1lcop+yLsJzjlzSEF2YqBQYvIAKMxhaSqtxB0=", + "lastModified": 1778864443, + "narHash": "sha256-3OIBgFPMab0avw5A0OcnGrmRTAbw573aAIgYERYRZ8g=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "ba7b8b92f1906de3742dadcbe2d032b5275da891", + "rev": "a62c86e5d6ce4efcd4f3be9526adfa52aa7286af", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1777713215, - "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", + "lastModified": 1778958912, + "narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=", "owner": "nix-community", "repo": "disko", - "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", + "rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1778839998, - "narHash": "sha256-RDgpRW/09hQMy2w+IAyS4M5lHJ24hvVQ9J4TY4m+7zc=", + "lastModified": 1778954430, + "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=", "owner": "nix-community", "repo": "home-manager", - "rev": "3e707f5f93d7be40fd3e4182ed977446bdf2e2c3", + "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a", "type": "github" }, "original": { @@ -517,11 +517,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1778841351, - "narHash": "sha256-a52shxptMqdBLiDkUq1rT7IQB3jRgZLWLvcZaMYX+Gg=", + "lastModified": 1778966108, + "narHash": "sha256-nq8lNb/YRIH6Re3AKtlJDjbx2RhhQYm1sCQVCf5moeY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b74b1f934f03b74df2214e06e26a8c9098236602", + "rev": "24c5c13c2cef2b4324478f2fb8c2ecc386dd42d3", "type": "github" }, "original": { @@ -843,11 +843,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1778600236, - "narHash": "sha256-jWlIT+uKqKZoz6rNweobs/h6FfI5dKnC5OO7/3T7Tdw=", + "lastModified": 1778942403, + "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f525d3b0a684d463dc9cf5c59359b9e67a372939", + "rev": "daefca3370581223fedc24d0101c4915a3689f9e", "type": "github" }, "original": { @@ -876,11 +876,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1778389445, - "narHash": "sha256-9NyDMVf8ydUZGTzcPcLMQf0o1B3bte/00UGbuXHNWh8=", + "lastModified": 1778858756, + "narHash": "sha256-9VvAHNoi2wd0fxLfJOPChZMS7l6rhCtAJmpd59Hv5rw=", "owner": "YaLTeR", "repo": "niri", - "rev": "38191826cb1e5fb9051a7e141fefe4941a2b4bed", + "rev": "cd5ac3e5e04bb5a11276d3c755fa25242818e05f", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1778786644, - "narHash": "sha256-Nmacd0dSaHA6L35fTa6aXXoQUhoFa7+Z1k13Y9G3DPY=", + "lastModified": 1778956518, + "narHash": "sha256-bbZMrzJtCqksaUBmAWSqmme/7PHEedPRAI3VmOSuP4A=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "f2004296fc7cf75fccfa1028a6253dd5f42456a8", + "rev": "ae5bc7641fb4178e4d9582ea49cab201f60f7869", "type": "github" }, "original": { @@ -945,11 +945,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1778430510, - "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -990,11 +990,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778729098, - "narHash": "sha256-17SbusskVZng4nwevRqsWNJf27nMG7UczvtgWTUJttg=", + "lastModified": 1778930970, + "narHash": "sha256-FqqcYr0c5in/HRL5bkRWykAGp/Q10Vj/zUiSr1P8URE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "39ea44cddd5060b8cd413ed5e13c6af61f302283", + "rev": "5a51fe22e18a6ce886b3cffa4c255378c151323c", "type": "github" }, "original": { @@ -1006,11 +1006,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778794387, - "narHash": "sha256-9yR9UAI7ZI5a98+eTkNFl8XogSQxU8bF3+pAU5zvuYI=", - "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406", + "lastModified": 1778869304, + "narHash": "sha256-vZOcDniDPc1cS8A4Xi5YE6AGyPIvEpy4GMyayA3SWIM=", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre998133.8a1b0127302e/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre998534.d233902339c0/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1019,11 +1019,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1778580735, - "narHash": "sha256-t+8AVV8ExvOmslz2sLIgw/hJBKlyl65rJvxjvvjHgpE=", + "lastModified": 1778794387, + "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48d91f2c0ce7b9e589f967d4f685153dd765dcdd", + "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406", "type": "github" }, "original": { @@ -1067,11 +1067,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-qeRNZKcA0igTdRVnBe6hyo49CqxME92s4G8Sr78ARJw=", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "lastModified": 1778869304, + "narHash": "sha256-VdRy3A14M5vIE882DJcaaR+5wrss9Qsg4YNVbr7uj3k=", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre992384.549bd84d6279/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre998534.d233902339c0/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1085,11 +1085,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1778844351, - "narHash": "sha256-qcxIr5tIeDh5pV9xI5X8Je4ZpHQCbClUp5wlo5FaPFA=", + "lastModified": 1778906310, + "narHash": "sha256-LqASEJRtLuKRBJd9051T1KMAEaYvsVrc6m64jhD6xbw=", "owner": "nix-community", "repo": "nixvim", - "rev": "40baf3664b73c1cdde67d46a462bed9d60d8d5b3", + "rev": "06cace835d7ee727852ac789e3dcd42fc2fd360e", "type": "github" }, "original": { @@ -1128,11 +1128,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1778738566, - "narHash": "sha256-nynayQlKH+toRLH7OkAiX7JpzZqgpmwLDY5WWKhw83I=", + "lastModified": 1778886193, + "narHash": "sha256-4W9rjS2PN8iVcFYkJgiGOE/U383njIRFxrRnL/edo6c=", "ref": "main", - "rev": "cb287d5009a89dfb7fa75c5a92a9eec52e33ef2f", - "revCount": 56, + "rev": "105e55b9baa8eafd7927038c59c43199444cf4b0", + "revCount": 60, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1362,11 +1362,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1778793632, - "narHash": "sha256-HYHD6J64bAWB2iT00lyyTn0wWcb0POtV+nPshYvq6Uc=", + "lastModified": 1779000518, + "narHash": "sha256-wdtytSnzMe85J/qeXJALMzSLRFTZ1gBHwn81l1PtT8k=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "e175a8b634e06a1b0635ec3d4db2c72cdc41fd15", + "rev": "5dde76b38418892ccb3d99e99bed7f8a43ac294c", "type": "github" }, "original": {