From f252a997dacaa679d10187745ff566da88065abb Mon Sep 17 00:00:00 2001 From: marthsincemelee Date: Sat, 9 Mar 2024 12:08:51 +0100 Subject: [PATCH 1/3] Configuration: Disable xserver --- machines/jupiter/configuration.nix | 4 ++-- machines/jupiter/environments.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/jupiter/configuration.nix b/machines/jupiter/configuration.nix index 3491fa6..0725066 100644 --- a/machines/jupiter/configuration.nix +++ b/machines/jupiter/configuration.nix @@ -21,8 +21,8 @@ # services.xserver.displayManager.gdm.enable = true; # services.xserver.desktopManager.gnome.enable = true; - services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; + # services.xserver.enable = true; + # services.xserver.displayManager.sddm.enable = true; services.openssh.enable = true; diff --git a/machines/jupiter/environments.nix b/machines/jupiter/environments.nix index 338463e..15d0ddd 100644 --- a/machines/jupiter/environments.nix +++ b/machines/jupiter/environments.nix @@ -9,7 +9,7 @@ in zsh.enable = true; apps = { desktop_apps = false; - dev_apps = true; + dev_apps = false; gnome_apps = false; }; radarr.enable = true; From 9696357a241bcfc9bff96a1705fc7458fb406ccd Mon Sep 17 00:00:00 2001 From: finn Date: Sat, 9 Mar 2024 12:31:34 +0100 Subject: [PATCH 2/3] OS-Update: 23.11 --- flake.lock | 164 ++++++++++++++++--------- flake.nix | 4 +- modules/hardware/bluetooth/default.nix | 4 +- 3 files changed, 113 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index 2acb166..0e0e450 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688254665, - "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "267149c58a14d15f7f81b4d737308421de9d7152", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -37,16 +37,18 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": "nixpkgs", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1690278576, - "narHash": "sha256-iNyj8azOheC7trYk2uWJr1pY4KilXC7+SyCzMgRrl04=", + "lastModified": 1709953765, + "narHash": "sha256-91LK3Ur3sy1jrh8Du8f+4maRVhcFNmwd6TBv7AxLGQU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4173d2ccf6d1b39581b6e50b76f1cd2c707cb845", + "rev": "3e930a568a76a810dde6bcabcf737a81850e7153", "type": "github" }, "original": { @@ -60,14 +62,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1684265364, - "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -76,35 +82,60 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1709775675, + "narHash": "sha256-G+gIMUQBtfbbrnsM/OPJzebdqKFP6typplNCE7X8Szw=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "f1db1a7e1faee2a5c67d03b6bd283da82eed3730", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", "type": "github" } }, "nix": { "inputs": { "flake-compat": "flake-compat", - "lowdown-src": "lowdown-src", + "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1688234932, - "narHash": "sha256-X0Tus1uP+tSBySLCUKlmV/Nv7Vfj4ljBL/ptsS0DQ6s=", + "lastModified": 1709945384, + "narHash": "sha256-7jY7r1vyUTqVX+hEACdgvpQVoKhii2muoIJYc5w8bRo=", "owner": "NixOS", "repo": "nix", - "rev": "7b39a388b382e7912de3c5951faad42fe2d72f48", + "rev": "3120fef01b0b78ab156865226839295b27694271", "type": "github" }, "original": { @@ -115,11 +146,11 @@ }, "nixlib": { "locked": { - "lastModified": 1688259758, - "narHash": "sha256-CYVbYQfIm3vwciCf6CCYE+WOOLE3vcfxfEfNHIfKUJQ=", + "lastModified": 1709426687, + "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a92befce80a487380ea5e92ae515fe33cebd3ac6", + "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c", "type": "github" }, "original": { @@ -136,11 +167,11 @@ ] }, "locked": { - "lastModified": 1688349424, - "narHash": "sha256-/wRCJP2d9ZmfZKrREWthpDHIx/F02Z1J2bytbC+gUiU=", + "lastModified": 1709887845, + "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "cf341a2c94338eed91c35df291931ea775b31e99", + "rev": "bef32a05496d9480b02be586fa7827748b9e597b", "type": "github" }, "original": { @@ -151,11 +182,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1709410583, + "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc", "type": "github" }, "original": { @@ -166,11 +197,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -183,11 +214,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -216,11 +247,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1688231357, - "narHash": "sha256-ZOn16X5jZ6X5ror58gOJAxPfFLAQhZJ6nOUeS4tfFwo=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "645ff62e09d294a30de823cb568e9c6d68e92606", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -231,32 +262,32 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1670461440, - "narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=", + "lastModified": 1709083642, + "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04a75b2eecc0acf6239acf9dd04485ff8d14f425", + "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11-small", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1688177999, - "narHash": "sha256-JZ5nk90Ym79b4J593xYb0mI79QxU0efJLuCU3sXDalQ=", + "lastModified": 1709884566, + "narHash": "sha256-NSYJg2sfdO/XS3L8XN/59Zhzn0dqWm7XtVnKI2mHq3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0de86059128947b2438995450f2c2ca08cc783d5", + "rev": "2be119add7b37dc535da2dd4cba68e2cf8d1517e", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "type": "indirect" } }, @@ -271,22 +302,37 @@ "nixpkgs-unstable": "nixpkgs-unstable" } }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1690165843, - "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -296,17 +342,25 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" ] }, "locked": { - "lastModified": 1685385764, - "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", + "lastModified": 1709299639, + "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", + "rev": "2d2fb547178ec025da643db57d40a971507b82fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 97577f6..a4c2bac 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nix.url = "github:NixOS/nix"; - nixpkgs.url = "nixpkgs/nixos-23.05"; + nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; @@ -32,4 +32,4 @@ systems = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/modules/hardware/bluetooth/default.nix b/modules/hardware/bluetooth/default.nix index e0d79a1..dab77e7 100644 --- a/modules/hardware/bluetooth/default.nix +++ b/modules/hardware/bluetooth/default.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable { hardware.bluetooth = { enable = true; - package = pkgs.bluezFull; + package = pkgs.bluez; settings = { General = { Enable = "Source,Sink,Media,Socket"; @@ -22,4 +22,4 @@ in sony-headphones-client ]; }; -} \ No newline at end of file +} From fecaa7dea975291c418e205316e6788d37103dd7 Mon Sep 17 00:00:00 2001 From: finn Date: Sat, 9 Mar 2024 12:44:37 +0100 Subject: [PATCH 3/3] Bug: zsh Theme --- modules/environments/zsh/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/environments/zsh/default.nix b/modules/environments/zsh/default.nix index 46416de..cb1413f 100644 --- a/modules/environments/zsh/default.nix +++ b/modules/environments/zsh/default.nix @@ -12,9 +12,8 @@ let config = lib.mkIf cfg.enable { programs.zsh.enable = true; programs.zsh.ohMyZsh.enable = true; - programs.zsh.ohMyZsh.theme = "Heapbytes"; users.defaultUserShell = pkgs.zsh; } ; -} \ No newline at end of file +}