diff --git a/flake.lock b/flake.lock index 58bceac..6c7c18d 100644 --- a/flake.lock +++ b/flake.lock @@ -81,12 +81,30 @@ "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" } }, + "complement": { + "flake": false, + "locked": { + "lastModified": 1714472853, + "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", + "owner": "matrix-org", + "repo": "complement", + "rev": "891d18872c153d39a9ce63b545045efddb845738", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, "conduit": { "inputs": { "attic": [ "chaotic", "attic" ], + "complement": "complement", "crane": [ "chaotic", "crane" @@ -110,7 +128,8 @@ "nixpkgs": [ "chaotic", "nixpkgs" - ] + ], + "rocksdb": "rocksdb" }, "locked": { "lastModified": 1713379868, @@ -143,7 +162,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" + "url": "https://flakehub.com/f/ipetkov/crane/%3D0.16.1.tar.gz" } }, "crane_2": { @@ -229,12 +248,12 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1711952616, - "narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=", - "rev": "209048d7c545905c470f6f8c05c5061f391031a8", - "revCount": 1822, + "lastModified": 1714544767, + "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=", + "rev": "73124e1356bde9411b163d636b39fe4804b7ca45", + "revCount": 1852, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1822%2Brev-209048d7c545905c470f6f8c05c5061f391031a8/018e98ba-d842-7dad-9d6a-0d0ee173b6b1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1852%2Brev-73124e1356bde9411b163d636b39fe4804b7ca45/018f333a-c195-795f-9e07-b43b47d5391f/source.tar.gz" }, "original": { "type": "tarball", @@ -1013,7 +1032,6 @@ "root": { "inputs": { "chaotic": "chaotic", - "gnome46": "gnome46", "home-manager": "home-manager_2", "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", @@ -1031,11 +1049,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1711885694, - "narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=", + "lastModified": 1714501997, + "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e4a405f877efd820bef9c0e77a02494e47c17512", + "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5fe748c..7efabd5 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,6 @@ url = "github:nix-community/lanzaboote/v0.3.0"; inputs.nixpkgs.follows = "nixpkgs"; }; - - gnome46.url = "github:NixOS/nixpkgs/gnome-46"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -34,7 +32,7 @@ }; outputs = { self, nixpkgs, nixpkgs-stable, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager - , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable, gnome46, nix-inspect, nixpkgs-unstable }@inputs: + , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable, nix-inspect, nixpkgs-unstable }@inputs: let inherit (self) outputs; in { @@ -42,7 +40,7 @@ in { nixosConfigurations = { # Desktop - "matt-nixos" = gnome46.lib.nixosSystem { + "matt-nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ impermanence.nixosModules.impermanence diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 83ce8ea..b47839d 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -10,8 +10,6 @@ let hostname = "matt-nixos"; gnome = true; plasma = false; - - # gnome46 = import (builtins.fetchTarball https://github.com/nixos/nixpgs/tarball/gnome-46) { config = config.nixpgs.config; }; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -68,9 +66,6 @@ in { bootspec.enable = true; }; - # gnome46.services.desktopManager.gnome.enable = true; - # gnome46.services.displayManager.gdm.enable = true; - # Services configs services = { # Enable the X11 windowing system. @@ -80,12 +75,17 @@ in { # Enable Desktop Environment. displayManager = { gdm.enable = gnome; - sddm.enable = plasma; - defaultSession = if plasma then "plasma" else "gnome"; }; desktopManager.gnome.enable = gnome; }; + + # Enable Desktop Environment. + displayManager = { + sddm.enable = plasma; + defaultSession = if plasma then "plasma" else "gnome"; + }; + # displayManager.gdm.enable = gnome; # desktopManager.gnome.enable = gnome; desktopManager.plasma6.enable = plasma; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 2355528..42688b9 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -15,7 +15,7 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; - options = [ "defaults" "size=32G" "mode=755" ]; + options = [ "defaults" "size=256G" "mode=755" ]; }; fileSystems."/nix" = { diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index cb2464a..11f2cd2 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -72,7 +72,7 @@ "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"]; + "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"