From f082127583c5a31bc73b5a2a106861568fbb95de Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Mon, 27 May 2024 13:21:42 -0500 Subject: [PATCH] updates --- flake.lock | 124 ++++++++++++++++++-------------- hosts/desktop/configuration.nix | 4 +- hosts/desktop/home.nix | 53 +++++++------- 3 files changed, 100 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index 59f7b22..e7e76d6 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1716563212, - "narHash": "sha256-m4M2EH9PcFGDpJRgK0u0FDadOBM8G02/p7F77fiEdNo=", + "lastModified": 1716816472, + "narHash": "sha256-u+Ub8IHGEIxj0gwpCXds4cWIc+hkTlRBL9RCBY/daNA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f3685d816317958caf2bce128f80d02fee65b163", + "rev": "a6f43e450d97eece8757e6cb6136f4cd4f141a3b", "type": "github" }, "original": { @@ -121,6 +121,7 @@ "chaotic", "flake-utils" ], + "liburing": "liburing", "nix-filter": [ "chaotic", "nix-filter" @@ -132,11 +133,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1716442236, - "narHash": "sha256-6iHSjtGDvgfAOamDXuKn7saTTz21h8Zqi57DEIjtSr4=", + "lastModified": 1716800097, + "narHash": "sha256-A8AXq7GqwLNOwCP6UyHzrusf2he6IYlD363/SrBKgts=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "eb8dd9cb44f2cb284d92da0e07db805d0f19ed37", + "rev": "6ccf578437a42cf8f32a454ca99b78df23cfa4dc", "type": "github" }, "original": { @@ -153,12 +154,12 @@ ] }, "locked": { - "lastModified": 1716156051, - "narHash": "sha256-TjUX7WWRcrhuUxDHsR8pDR2N7jitqZehgCVSy3kBeS8=", - "rev": "7443df1c478947bf96a2e699209f53b2db26209d", - "revCount": 571, + "lastModified": 1716745752, + "narHash": "sha256-8K1R9Yg4r08rYk86Yq+lu3E9L3uRUb4xMqYHgl0VGS0=", + "rev": "19ca94ec2d288de334ae932107816b4a97736cd8", + "revCount": 575, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.1/018f92f7-d079-7a6a-8660-4fa94147552e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.17.2/018fb607-1f2c-764b-bd8d-5ea0dd2a7665/source.tar.gz" }, "original": { "type": "tarball", @@ -409,11 +410,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -429,11 +430,11 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716729592, + "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", "type": "github" }, "original": { @@ -450,11 +451,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -487,11 +488,11 @@ ] }, "locked": { - "lastModified": 1716455390, - "narHash": "sha256-HZockBczLQPFqZMpxi0Xv/vxeqamJrSveFIRIpkiGrs=", + "lastModified": 1716618639, + "narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e3f0e189e5ab4a28c51f84d5a052a39423ccc838", + "rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38", "type": "github" }, "original": { @@ -513,11 +514,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716518043, - "narHash": "sha256-JSRVAZdk1ZMWEmiqtVAUkDgs3/MbGQcbM1M/EJMsSSw=", + "lastModified": 1716773713, + "narHash": "sha256-++tmVuLwprXWSSq9AmfcZ4MjorMueuO5ThwuTzhp5SE=", "owner": "martinvonz", "repo": "jj", - "rev": "2e0dde81a626fda184e1846d98183bc1f95fd127", + "rev": "a075a5c6cabd493759fc973d99d3fd88feb74735", "type": "github" }, "original": { @@ -553,6 +554,23 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1716565485, + "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", + "owner": "axboe", + "repo": "liburing", + "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -620,11 +638,11 @@ ] }, "locked": { - "lastModified": 1716554875, - "narHash": "sha256-BBAiAeWPwoOJyeW9PAnxSxS9kAi2b/T8bh8ChIfAD5Q=", + "lastModified": 1716744562, + "narHash": "sha256-th1cXNfqbNstk6LNC2siouLQP5N4Ur69iV3idlKj8iE=", "owner": "YaLTeR", "repo": "niri", - "rev": "2ac8d840343dc964981507353c9128c68361cb6f", + "rev": "ae7fb4c4f405aa0ff49930040d414581a812d938", "type": "github" }, "original": { @@ -731,11 +749,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1716521847, - "narHash": "sha256-4sRvBx46iQycFNyUcaWevGzeudhil9HyWxiFb9zPsNE=", + "lastModified": 1716699938, + "narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "a9f9b2aae396861cdd99bd7b12abcc469a2bfa9e", + "rev": "842306255856d7f5677c113e699101eb253e2e3f", "type": "github" }, "original": { @@ -746,11 +764,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716798306, + "narHash": "sha256-s8+OhT1WSPMoqbTawT30hj4NVMg+w03/a+2HVqcNhY0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "9a20e17a73b052d6be912adcee220cb483477094", "type": "github" }, "original": { @@ -762,12 +780,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "revCount": 629726, + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "revCount": 630835, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.629726%2Brev-5710852ba686cc1fd0d3b8e22b3117d43ba374c2/018fa276-eb5e-762d-b67b-85f281987019/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.630835%2Brev-bfb7a882678e518398ce9a31a881538679f6f092/018fafb0-ec0d-7254-8082-b09ecc86e5fc/source.tar.gz" }, "original": { "type": "tarball", @@ -808,11 +826,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", "type": "github" }, "original": { @@ -824,11 +842,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -885,11 +903,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1017,16 +1035,16 @@ "rocksdb": { "flake": false, "locked": { - "lastModified": 1714770052, - "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "lastModified": 1716773462, + "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", "owner": "girlbossceo", "repo": "rocksdb", - "rev": "db6df0b185774778457dabfcbd822cb81760cade", + "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", "type": "github" }, "original": { "owner": "girlbossceo", - "ref": "v9.1.1", + "ref": "v9.2.1", "repo": "rocksdb", "type": "github" } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 7e0be53..70d1493 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -8,8 +8,8 @@ let password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06"; hostname = "matt-nixos"; - gnome = true; - plasma = false; + gnome = false; + plasma = true; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 75994e2..ad73117 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -41,6 +41,7 @@ # gamescope-wsi # using chaotic git version gamescope_git gamescope-wsi_git + lutris mangohud goverlay heroic @@ -60,30 +61,30 @@ pop-gtk-theme ]; - dconf = { - enable = true; - settings = { - "org/gnome/desktop/interface".clock-format = "12h"; - "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - "org/gnome/desktop/interface".enable-hot-corners = false; - "org/gnome/desktop/interface".font-antialiasing = "grayscale"; - "org/gnome/desktop/interface".font-hinting = "slight"; - "org/gnome/desktop/interface".icon-theme = "Papirus-Dark"; - "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; - "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; - "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; - "org/gnome/mutter".experimental-features = [ "scale-monitor-framebuffer" "variable-refresh-rate" ]; - "org/gnome/tweaks".show-extensions-notice = false; - "org/gnome/shell".enabled-extensions = [ - "appindicatorsupport@rgcjonas.gmail.com" - "arcmenu@arcmenu.com" - "user-theme@gnome-shell-extensions.gcampax.github.com" - "dash-to-panel@jderose9.github.com" - "tiling-assistant@leleat-on-github" - ]; - "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1; - "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false; - "org/gtk/settings/file-chooser".clock-format = "12h"; - }; - }; + # dconf = { + # enable = true; + # settings = { + # "org/gnome/desktop/interface".clock-format = "12h"; + # "org/gnome/desktop/interface".color-scheme = "prefer-dark"; + # "org/gnome/desktop/interface".enable-hot-corners = false; + # "org/gnome/desktop/interface".font-antialiasing = "grayscale"; + # "org/gnome/desktop/interface".font-hinting = "slight"; + # "org/gnome/desktop/interface".icon-theme = "Papirus-Dark"; + # "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; + # "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; + # "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; + # "org/gnome/mutter".experimental-features = [ "scale-monitor-framebuffer" "variable-refresh-rate" ]; + # "org/gnome/tweaks".show-extensions-notice = false; + # "org/gnome/shell".enabled-extensions = [ + # "appindicatorsupport@rgcjonas.gmail.com" + # "arcmenu@arcmenu.com" + # "user-theme@gnome-shell-extensions.gcampax.github.com" + # "dash-to-panel@jderose9.github.com" + # "tiling-assistant@leleat-on-github" + # ]; + # "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1; + # "org/gnome/shell/extensions/dash-to-panel".multi-monitors = false; + # "org/gtk/settings/file-chooser".clock-format = "12h"; + # }; + # }; }