diff --git a/desktop/cosmic.nix b/desktop/cosmic.nix new file mode 100644 index 0000000..f425145 --- /dev/null +++ b/desktop/cosmic.nix @@ -0,0 +1,8 @@ +{...}: +{ + # Enable the COSMIC login manager + services.displayManager.cosmic-greeter.enable = true; + + # Enable the COSMIC desktop environment + services.desktopManager.cosmic.enable = true; +} diff --git a/flake.lock b/flake.lock index 1435a64..25cd66c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1763050369, - "narHash": "sha256-bHf8baCYAP+pbAjT0x8PINNdy7hxKCgtHaHb1zK0WoA=", + "lastModified": 1766319669, + "narHash": "sha256-O0TyVcz3xhDmBZsoVPchcxENrcfO5GAEc4N8j58nai0=", "owner": "asus-linux-drivers", "repo": "asus-numberpad-driver", - "rev": "c3d7a234221bf089e87eb3d3b4625062363ddb50", + "rev": "38198d181d1381df46d3e98814cb8e81581cc26f", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763563060, - "narHash": "sha256-WoNrCTrsiONytvw31fvaRzwc9RcqqHv/LUyYyYflgIg=", + "lastModified": 1765204341, + "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c5bfa8ed2037abd4ca213b363065cb6f76155035", + "rev": "aacb796ccd42be1555196c20013b9b674b71df75", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1763992789, + "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1766282146, + "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1763453666, - "narHash": "sha256-Hu8lDUlbMFvcYX30LBXX7Gq5FbU35bERH0pSX5qHf/Q=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b843b551415c7aecc97c8b3ab3fff26fd0cd8bbf", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1763435414, - "narHash": "sha256-i2467FddWfd19q5Qoj+1/BAeg6LZmM5m4mYGRSQn/as=", + "lastModified": 1766242842, + "narHash": "sha256-WRWsYt3d4xod9+2SVJ1h7RH+rHo4Fjk/R1neEWdecaE=", "ref": "refs/heads/main", - "rev": "192c92b603731fbc1bade6c1b18c8d8a0086f703", - "revCount": 169, + "rev": "9b76a77150b4ed4f7066f641f54791b1ac4c778c", + "revCount": 172, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1766014764, + "narHash": "sha256-+73VffE5GP5fvbib6Hs1Su6LehG+9UV1Kzs90T2gBLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "2b0d2b456e4e8452cf1c16d00118d145f31160f9", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1763433504, - "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -483,11 +483,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763118570, - "narHash": "sha256-k9+gwT+5JQnudWjfkEOornJw0AIRrg7LUVEDIDKMhXE=", + "lastModified": 1766092334, + "narHash": "sha256-C2wfoRLRFCn+JPO8mlFsHCtKYEBzD6FNgmJyawaiv/U=", "owner": "kartavkun", "repo": "zapret-discord-youtube", - "rev": "4a759fe4de4b295a53c89941395a58f39297ac51", + "rev": "6e32c8013acf6c970ba377b95e23a4274e3e8983", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c6273d..3010f0e 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,7 @@ ./hosts/generic/unfree_allow.nix ./hosts/Aphelion/hardware-Aphelion.nix ./hosts/Aphelion/sunshine.nix - ./desktop/gnome.nix + ./desktop/kde.nix ./home/yaroslav/steam.nix ./hosts/generic/teamspeak.nix ./hosts/Aphelion/nfs.nix diff --git a/home/yaroslav/Aphelion/mpd.nix b/home/yaroslav/Aphelion/mpd.nix index 674d601..5ec66ae 100644 --- a/home/yaroslav/Aphelion/mpd.nix +++ b/home/yaroslav/Aphelion/mpd.nix @@ -14,6 +14,10 @@ name "Qwark pulseuadio" server "192.168.1.94" } + # audio_output { + # type "alsa" + # name "Alsa" + # } ''; }; } diff --git a/home/yaroslav/home.nix b/home/yaroslav/home.nix index 9fc4093..4cb8bff 100644 --- a/home/yaroslav/home.nix +++ b/home/yaroslav/home.nix @@ -66,7 +66,6 @@ in yt-dlp zsh-powerlevel10k meslo-lgs-nf - python313 distrobox scrcpy screen diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix index 69d5e08..cd56700 100644 --- a/hosts/Aphelion/hardware-Aphelion.nix +++ b/hosts/Aphelion/hardware-Aphelion.nix @@ -70,7 +70,7 @@ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; - chaotic.mesa-git.enable = true; + #chaotic.mesa-git.enable = true; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/generic/configuration_generic.nix b/hosts/generic/configuration_generic.nix index b3e5b73..84736c8 100644 --- a/hosts/generic/configuration_generic.nix +++ b/hosts/generic/configuration_generic.nix @@ -25,6 +25,11 @@ enable = true; defaultEditor = true; }; + fonts.packages = with pkgs; [ + ubuntu-classic # For standard Ubuntu fonts + # nerdFonts.override { fonts = [ "JetBrainsMono" ]; } # For specific Nerd Fonts + # noto-fonts + ]; services.openssh.enable = true; services.openssh.settings.X11Forwarding = true; @@ -36,7 +41,7 @@ networkmanager-openvpn ]; }; - networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 554 80 27040 ]; + networking.firewall.allowedTCPPorts = [ 22 3240 2049 25565 554 80 27040 8044 ]; networking.firewall.allowedUDPPorts = [ 38401 25565 554 80 27031 27032 27033 27034 27035 27036 ]; networking.nftables.enable = true; networking.hosts = { diff --git a/hosts/generic/persistence.nix b/hosts/generic/persistence.nix index 9a7b22f..c9eaecf 100644 --- a/hosts/generic/persistence.nix +++ b/hosts/generic/persistence.nix @@ -9,6 +9,7 @@ "/var/lib/systemd/coredump" "/var/lib/systemd/timers" "/var/lib/fprint" + "/var/lib/flatpak" "/var/lib/libvirt" "/var/lib/waydroid" "/var/lib/teamspeak3-server"