diff --git a/flake.lock b/flake.lock index afb4cf03..e577a5a7 100644 --- a/flake.lock +++ b/flake.lock @@ -82,12 +82,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1729092978, - "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", - "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", - "revCount": 1456, + "lastModified": 1729510449, + "narHash": "sha256-/EwjBMYBZ3/2ROT+4M/6tLomgJEgZBpKosWhqtYZkDI=", + "rev": "4e03e8d762623ca925c604800aa18f109cd3bd97", + "revCount": 1466, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1456%2Brev-9af42c96e8d666f1df2b087aba1a6349f1c22f4e/019295fc-24f9-7d1b-a753-8e461947e187/source.tar.gz?rev=9af42c96e8d666f1df2b087aba1a6349f1c22f4e&revCount=1456" + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nyx/0.1.1466%2Brev-4e03e8d762623ca925c604800aa18f109cd3bd97/0192aeee-014a-76ac-b6c9-3dd9d3641bcf/source.tar.gz?rev=4e03e8d762623ca925c604800aa18f109cd3bd97&revCount=1466" }, "original": { "type": "tarball", @@ -95,18 +95,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "helix-flake", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1709610799, - "narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "81c393c776d5379c030607866afef6406ca1be57", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -152,6 +146,27 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1729492502, + "narHash": "sha256-d6L4bBlUWr4sHC+eRXo+4acFPEFXKmqHpM/BfQ5gQQw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "4002a1ec3486b855f341d2b864ba06b61e73af28", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -321,11 +336,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -380,11 +395,11 @@ }, "hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729509737, + "narHash": "sha256-8OHgqz+tFo21h3hg4/GHizFPws+MMzpEru/+62Z0E8c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "cc2d3c0e060f981905d52337340ee6ec8b8eb037", "type": "github" }, "original": { @@ -401,11 +416,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729068734, - "narHash": "sha256-JOqmdtcdQohQL1qvTDrVJvd+nkydRm+Lyf3qVF5iQ5E=", + "lastModified": 1729477666, + "narHash": "sha256-ri40XjKyZIMH5wBCFNa50dq5wTBPF5qH/NVDo+syhNM=", "owner": "helix-editor", "repo": "helix", - "rev": "d1b8129491124ce6068e95ccc58a7fefb1c9db45", + "rev": "6d64e6288add793caf1c841ea295518414c04ea0", "type": "github" }, "original": { @@ -446,11 +461,11 @@ ] }, "locked": { - "lastModified": 1729171802, - "narHash": "sha256-Eip3uI+XeyAfBoQXpkm/F7eG3M7AgvzSyhyJdzxVt74=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9c1a1c7df49a9b28539ccb509b36d0b81e41391c", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -488,11 +503,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -550,11 +565,11 @@ ] }, "locked": { - "lastModified": 1727257269, - "narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=", + "lastModified": 1729461877, + "narHash": "sha256-ze3eqyh2Z4nYaR67BEs+Oy9r+UsPQjfJzQHdQPjNdYU=", "owner": "hyprwm", "repo": "hypridle", - "rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32", + "rev": "0ed59e861cd9927a9a3c32c79dd91143db56a9c7", "type": "github" }, "original": { @@ -577,11 +592,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729174818, - "narHash": "sha256-Mi2D5p4cJ9FQBTBPLHmYZF+xSGiwf6mwVQ+RspnS+z0=", + "lastModified": 1729523354, + "narHash": "sha256-iRLBeVWU6rbMruacoMOJ6y+mgTVMWng4T8JYnIPgsSE=", "ref": "refs/heads/main", - "rev": "495b92fb535f51a38e5130e6b89bd1fb01ce8cfb", - "revCount": 5350, + "rev": "9df0f0b66c66706c9ce8cf9f80e834d5abfc1e96", + "revCount": 5364, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -600,11 +615,11 @@ ] }, "locked": { - "lastModified": 1725551787, - "narHash": "sha256-6LgsZHz8w3g4c9bRUwRAR+WIMwFGGf3P1VZQcKNRf2o=", + "lastModified": 1729224425, + "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", "owner": "hyprwm", "repo": "contrib", - "rev": "1e531dc49ad36c88b45bf836081a7a2c8927e072", + "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", "type": "github" }, "original": { @@ -818,11 +833,11 @@ ] }, "locked": { - "lastModified": 1728974938, - "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "23170582b0658e6afd913149a58863af3a57b376", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -883,11 +898,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729108264, - "narHash": "sha256-Jj0/IfDG9VpiByg823MjaDy6LIbUPjEfqsbqhJvI1RA=", + "lastModified": 1729525221, + "narHash": "sha256-c2K2DKeKDnDaVLOzBPpe2XWuoHyfXWjat2lLbNQbHhQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dd69b3d1751f0ba03711585cd0c03eae8ac93ea2", + "rev": "d5baae772ce87682c624233c7a9265b387caa818", "type": "github" }, "original": { @@ -961,11 +976,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1729164558, - "narHash": "sha256-dgla/HMyeUIbs0Qtd9DLB4BKFNz+Z8rUO0pbaW5ie2M=", + "lastModified": 1729493358, + "narHash": "sha256-Ti+Y9nWt5Fcs3JlarxLPgIOVlbqQo7jobz/qOwOaziM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bddc04f2eecdadeb2a7ab3674bdafc27b933f76", + "rev": "a5e6a9e979367ee14f65d9c38119c30272f8455f", "type": "github" }, "original": { @@ -1025,11 +1040,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1041,11 +1056,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1104,11 +1119,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -1136,11 +1151,11 @@ }, "nur": { "locked": { - "lastModified": 1729180066, - "narHash": "sha256-sUGEUHLx95k/EDnyHCQ/9zJN2eoKShvp3NME1rG5LVQ=", + "lastModified": 1729525671, + "narHash": "sha256-/pZSi3LBtztMfOJti72FOj3OBJvsCb1N/d9Jl5L04fI=", "owner": "nix-community", "repo": "NUR", - "rev": "42479f1604fa30d150be27d33bd71ea0bcc1bb8d", + "rev": "305d127d2f03fb412de348455a3175df9e66cd04", "type": "github" }, "original": { @@ -1205,6 +1220,7 @@ "agenix": "agenix", "anyrun": "anyrun", "chaotic": "chaotic", + "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", @@ -1228,23 +1244,36 @@ "zen-browser": "zen-browser" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1729454508, + "narHash": "sha256-1W5B/CnLgdC03iIFG0wtawO1+dGDWDpc84PeOHo2ecU=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "9323b5385863739d1c113f02e4cf3f2777c09977", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { - "flake-utils": [ - "helix-flake", - "flake-utils" - ], "nixpkgs": [ "helix-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1709604635, - "narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { @@ -1393,11 +1422,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1729184579, - "narHash": "sha256-vRpXdpqeiBkEUUvoB5lkhuyHHTSWL9FOcq31ytKfMcQ=", + "lastModified": 1729481341, + "narHash": "sha256-DS9tbS2TtAp4kUKUW5wUA0TbK7Dx1WOMBkRJLkEC6Cg=", "ref": "refs/heads/main", - "rev": "dacc6c8338c1bd27e2b63c98e6488c2f0ca2ec85", - "revCount": 792, + "rev": "0aea3e7fbfdbe172e07983b9b23b601f821495df", + "revCount": 810, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/flake.nix b/flake.nix index 33c5092f..64ef74c3 100644 --- a/flake.nix +++ b/flake.nix @@ -107,10 +107,10 @@ agenix.url = "github:ryantm/agenix"; # Rust toolchain - # fenix = { - # url = "github:nix-community/fenix"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; zen-browser = { url = "github:cnsta/zen-browser-flake"; diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 9ec0c845..2bab9b85 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -23,9 +23,9 @@ # gamescope = { # enable = true; # }; - lutris = { - enable = true; - }; + # lutris = { + # enable = true; + # }; gamemode = { enable = true; optimizeGpu = { diff --git a/modules/default.nix b/modules/default.nix index 99e1c8f8..37b1a17c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,6 +13,8 @@ ./home/devtools/vscode ./home/gaming/steam + ./home/gaming/mangohud + ./home/gaming/lutris ./home/cli/alacritty ./home/cli/bash diff --git a/modules/home/devtools/helix/default.nix b/modules/home/devtools/helix/default.nix index 5d208bca..5e680a06 100644 --- a/modules/home/devtools/helix/default.nix +++ b/modules/home/devtools/helix/default.nix @@ -35,7 +35,7 @@ in { normal = "block"; select = "underline"; }; - indent-guides.render = false; + indent-guides.render = true; inline-diagnostics = { cursor-line = "hint"; other-lines = "error"; diff --git a/modules/home/gaming/lutris/default.nix b/modules/home/gaming/lutris/default.nix index 09ade237..8cb9cb34 100644 --- a/modules/home/gaming/lutris/default.nix +++ b/modules/home/gaming/lutris/default.nix @@ -17,7 +17,7 @@ in { p.wineWowPackages.staging p.pixman p.libjpeg - p.gnome.zenity + p.zenity ]; }) ]; diff --git a/modules/home/userd/gtk/default.nix b/modules/home/userd/gtk/default.nix index c50ed4d6..010f37c5 100644 --- a/modules/home/userd/gtk/default.nix +++ b/modules/home/userd/gtk/default.nix @@ -1,91 +1,100 @@ { pkgs, config, + lib, ... -}: { - home = { - packages = [pkgs.glib]; # gsettings - pointerCursor = { - # package = pkgs.catppuccin-cursors.latteDark; - # name = "catppuccin-latte-dark-cursors"; - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; - size = 28; - gtk.enable = true; - x11.enable = true; - }; +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.userd.gtk; +in { + options = { + home.userd.gtk.enable = mkEnableOption "Enables miscellaneous GTK elements"; }; - gtk = { - enable = true; - theme = { - package = pkgs.orchis-theme; - name = "Orchis-Grey-Dark-Compact"; - }; - iconTheme = { - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; - }; - font = { - name = "Input Sans Narrow Light"; - size = 10; - }; - cursorTheme = { - # package = pkgs.catppuccin-cursors.latteDark; - # name = "catppuccin-latte-dark-cursors"; - package = pkgs.adwaita-icon-theme; - name = "Adwaita"; - size = 28; + config = mkIf cfg.enable { + home = { + packages = [pkgs.glib]; # gsettings + pointerCursor = { + # package = pkgs.catppuccin-cursors.latteDark; + # name = "catppuccin-latte-dark-cursors"; + package = pkgs.adwaita-icon-theme; + name = "Adwaita"; + size = 28; + gtk.enable = true; + x11.enable = true; + }; }; + gtk = { + enable = true; + theme = { + package = pkgs.orchis-theme; + name = "Orchis-Grey-Dark-Compact"; + }; + iconTheme = { + package = pkgs.adwaita-icon-theme; + name = "Adwaita"; + }; + font = { + name = "Input Sans Narrow Light"; + size = 10; + }; + cursorTheme = { + # package = pkgs.catppuccin-cursors.latteDark; + # name = "catppuccin-latte-dark-cursors"; + package = pkgs.adwaita-icon-theme; + name = "Adwaita"; + size = 28; + }; - gtk2 = { - configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - extraConfig = '' - gtk-xft-antialias=1 - gtk-xft-hinting=1 - gtk-xft-hintstyle="hintslight" - gtk-xft-rgba="rgb" - ''; - }; + gtk2 = { + configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + extraConfig = '' + gtk-xft-antialias=1 + gtk-xft-hinting=1 + gtk-xft-hintstyle="hintslight" + gtk-xft-rgba="rgb" + ''; + }; - gtk3.extraConfig = { - # Lets be easy on the eyes. This should be easy to make dependent on - # the "variant" of the theme, but I never use a light theme anyway. - gtk-application-prefer-dark-theme = true; + gtk3.extraConfig = { + # Lets be easy on the eyes. This should be easy to make dependent on + # the "variant" of the theme, but I never use a light theme anyway. + gtk-application-prefer-dark-theme = true; - # Decorations - gtk-decoration-layout = "appmenu:none"; - gtk-toolbar-style = "GTK_TOOLBAR_BOTH"; - gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR"; - gtk-button-images = 1; - gtk-menu-images = 1; + # Decorations + gtk-decoration-layout = "appmenu:none"; + gtk-toolbar-style = "GTK_TOOLBAR_BOTH"; + gtk-toolbar-icon-size = "GTK_ICON_SIZE_LARGE_TOOLBAR"; + gtk-button-images = 1; + gtk-menu-images = 1; - # Silence bells and whistles, quite literally. - gtk-error-bell = 0; - gtk-enable-event-sounds = 0; - gtk-enable-input-feedback-sounds = 0; + # Silence bells and whistles, quite literally. + gtk-error-bell = 0; + gtk-enable-event-sounds = 0; + gtk-enable-input-feedback-sounds = 0; - # Fonts - gtk-xft-antialias = 1; - gtk-xft-hinting = 1; - gtk-xft-hintstyle = "hintslight"; - }; + # Fonts + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintslight"; + }; - gtk4.extraConfig = { - # Prefer dark theme. - gtk-application-prefer-dark-theme = true; + gtk4.extraConfig = { + # Prefer dark theme. + gtk-application-prefer-dark-theme = true; - # Decorations. - gtk-decoration-layout = "appmenu:none"; + # Decorations. + gtk-decoration-layout = "appmenu:none"; - # Sounds, again. - gtk-error-bell = 0; - gtk-enable-event-sounds = 0; - gtk-enable-input-feedback-sounds = 0; + # Sounds, again. + gtk-error-bell = 0; + gtk-enable-event-sounds = 0; + gtk-enable-input-feedback-sounds = 0; - # Fonts, you know the drill. - gtk-xft-antialias = 1; - gtk-xft-hinting = 1; - gtk-xft-hintstyle = "hintslight"; + # Fonts, you know the drill. + gtk-xft-antialias = 1; + gtk-xft-hinting = 1; + gtk-xft-hintstyle = "hintslight"; + }; }; }; } diff --git a/modules/home/userd/polkit/default.nix b/modules/home/userd/polkit/default.nix index dd55fd16..27471212 100644 --- a/modules/home/userd/polkit/default.nix +++ b/modules/home/userd/polkit/default.nix @@ -1,19 +1,32 @@ -{pkgs, ...}: { - systemd.user.services.polkit-gnome-authentication-agent-1 = { - Unit.Description = "polkit-gnome-authentication-agent-1"; +{ + pkgs, + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.userd.polkit; +in { + options = { + home.userd.polkit.enable = mkEnableOption "Enables polkit"; + }; + config = mkIf cfg.enable { + systemd.user.services.polkit-gnome-authentication-agent-1 = { + Unit.Description = "polkit-gnome-authentication-agent-1"; - Install = { - WantedBy = ["graphical-session.target"]; - Wants = ["graphical-session.target"]; - After = ["graphical-session.target"]; - }; + Install = { + WantedBy = ["graphical-session.target"]; + Wants = ["graphical-session.target"]; + After = ["graphical-session.target"]; + }; - Service = { - Type = "simple"; - ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; + Service = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; }; }; } diff --git a/modules/home/userd/xdg/default.nix b/modules/home/userd/xdg/default.nix index 61c5f7c9..77c67282 100644 --- a/modules/home/userd/xdg/default.nix +++ b/modules/home/userd/xdg/default.nix @@ -1,16 +1,28 @@ -{config, ...}: { - xdg = { - userDirs = { - enable = true; - createDirectories = true; - desktop = "${config.home.homeDirectory}/desktop"; - documents = "${config.home.homeDirectory}/documents"; - download = "${config.home.homeDirectory}/downloads"; - music = "${config.home.homeDirectory}/media/music"; - pictures = "${config.home.homeDirectory}/media/images"; - publicShare = "${config.home.homeDirectory}/documents/share"; - templates = "${config.home.homeDirectory}/documents/templates"; - videos = "${config.home.homeDirectory}/media/videos"; +{ + config, + lib, + ... +}: let + inherit (lib) mkIf mkEnableOption; + cfg = config.home.userd.xdg; +in { + options = { + home.userd.xdg.enable = mkEnableOption "Enables XDG settings"; + }; + config = mkIf cfg.enable { + xdg = { + userDirs = { + enable = true; + createDirectories = true; + desktop = "${config.home.homeDirectory}/desktop"; + documents = "${config.home.homeDirectory}/documents"; + download = "${config.home.homeDirectory}/downloads"; + music = "${config.home.homeDirectory}/media/music"; + pictures = "${config.home.homeDirectory}/media/images"; + publicShare = "${config.home.homeDirectory}/documents/share"; + templates = "${config.home.homeDirectory}/documents/templates"; + videos = "${config.home.homeDirectory}/media/videos"; + }; }; }; } diff --git a/modules/system/hardware/graphics/amd/default.nix b/modules/system/hardware/graphics/amd/default.nix index fd3a4137..7d339805 100644 --- a/modules/system/hardware/graphics/amd/default.nix +++ b/modules/system/hardware/graphics/amd/default.nix @@ -16,15 +16,15 @@ in { enable = true; enable32Bit = true; # extraPackages = with pkgs; [ - # libva - # vaapiVdpau - # libvdpau-va-gl - # amdvlk - # vulkan-tools + # libva + # vaapiVdpau + # libvdpau-va-gl + # amdvlk + # vulkan-tools # ]; # extraPackages32 = with pkgs.pkgsi686Linux; [ - # vaapiVdpau - # libvdpau-va-gl + # vaapiVdpau + # libvdpau-va-gl # ]; }; }; diff --git a/modules/system/utils/chaotic/default.nix b/modules/system/utils/chaotic/default.nix index 57b47637..73c600cf 100644 --- a/modules/system/utils/chaotic/default.nix +++ b/modules/system/utils/chaotic/default.nix @@ -30,6 +30,7 @@ in { enable = true; extraPackages = with pkgs; [ libva + libvdpau-va-gl vaapiVdpau libdrm_git latencyflex-vulkan @@ -48,10 +49,12 @@ in { vulkanPackages_latest.vulkan-validation-layers vulkanPackages_latest.vulkan-volk ]; - extraPackages32 = with pkgs; [ - mesa32_git + extraPackages32 = with pkgs.pkgsi686Linux; [ + pkgs.mesa32_git + pkgs.mesa32_git.opencl libdrm32_git libva + libvdpau-va-gl vaapiVdpau ]; }; diff --git a/modules/system/utils/misc/default.nix b/modules/system/utils/misc/default.nix index c0bebf06..127fc869 100644 --- a/modules/system/utils/misc/default.nix +++ b/modules/system/utils/misc/default.nix @@ -27,7 +27,6 @@ in { (mkIf cfg.desktop.enable [ pkgs.protonup pkgs.winetricks - pkgs.tor-browser ]) ]; }; diff --git a/system/nix/shell/default.nix b/system/nix/shell/default.nix index 0915d2cc..842a0f35 100644 --- a/system/nix/shell/default.nix +++ b/system/nix/shell/default.nix @@ -6,13 +6,13 @@ default = pkgs.mkShell { # Add Rust toolchain from Fenix and rust-analyzer-nightly packages = [ - # (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ - # "cargo" - # "clippy" - # "rust-src" - # "rustc" - # "rustfmt" - # ]) + (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ + "cargo" + "clippy" + "rust-src" + "rustc" + "rustfmt" + ]) ]; nativeBuildInputs = with pkgs; [ diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index 21bc7f43..d9baffd8 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -41,9 +41,12 @@ steam = { enable = true; }; - # mangohud = { - # enable = false; - # }; + mangohud = { + enable = true; + }; + lutris = { + enable = true; + }; }; cli = { alacritty = { @@ -81,15 +84,24 @@ gpg = { enable = false; }; + gtk = { + enable = true; + }; mako = { enable = true; }; udiskie = { enable = true; }; + polkit = { + enable = true; + }; syncthing = { enable = true; }; + xdg = { + enable = true; + }; }; utils = { anyrun = {