This commit is contained in:
mjallen18
2024-05-05 14:00:55 -05:00
parent 040cbfb1de
commit de45316414
5 changed files with 40 additions and 24 deletions

40
flake.lock generated
View File

@@ -81,12 +81,30 @@
"url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" "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": { "conduit": {
"inputs": { "inputs": {
"attic": [ "attic": [
"chaotic", "chaotic",
"attic" "attic"
], ],
"complement": "complement",
"crane": [ "crane": [
"chaotic", "chaotic",
"crane" "crane"
@@ -110,7 +128,8 @@
"nixpkgs": [ "nixpkgs": [
"chaotic", "chaotic",
"nixpkgs" "nixpkgs"
] ],
"rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1713379868, "lastModified": 1713379868,
@@ -143,7 +162,7 @@
}, },
"original": { "original": {
"type": "tarball", "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": { "crane_2": {
@@ -229,12 +248,12 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1711952616, "lastModified": 1714544767,
"narHash": "sha256-WJvDdOph001fA1Ap3AyaQtz/afJAe7meSG5uJAdSE+A=", "narHash": "sha256-kF1bX+YFMedf1g0PAJYwGUkzh22JmULtj8Rm4IXAQKs=",
"rev": "209048d7c545905c470f6f8c05c5061f391031a8", "rev": "73124e1356bde9411b163d636b39fe4804b7ca45",
"revCount": 1822, "revCount": 1852,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -1013,7 +1032,6 @@
"root": { "root": {
"inputs": { "inputs": {
"chaotic": "chaotic", "chaotic": "chaotic",
"gnome46": "gnome46",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"home-manager-stable": "home-manager-stable", "home-manager-stable": "home-manager-stable",
"impermanence": "impermanence", "impermanence": "impermanence",
@@ -1031,11 +1049,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711885694, "lastModified": 1714501997,
"narHash": "sha256-dyezzeSbWMpflma+E9USmvSxuLgGcNGcGw3cOnX36ko=", "narHash": "sha256-g31zfxwUFzkPgX0Q8sZLcrqGmOxwjEZ/iqJjNx4fEGo=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "e4a405f877efd820bef9c0e77a02494e47c17512", "rev": "49e502b277a8126a9ad10c802d1aaa3ef1a280ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -17,8 +17,6 @@
url = "github:nix-community/lanzaboote/v0.3.0"; url = "github:nix-community/lanzaboote/v0.3.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
gnome46.url = "github:NixOS/nixpkgs/gnome-46";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -34,7 +32,7 @@
}; };
outputs = { self, nixpkgs, nixpkgs-stable, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager 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 let
inherit (self) outputs; inherit (self) outputs;
in { in {
@@ -42,7 +40,7 @@ in {
nixosConfigurations = { nixosConfigurations = {
# Desktop # Desktop
"matt-nixos" = gnome46.lib.nixosSystem { "matt-nixos" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence

View File

@@ -10,8 +10,6 @@ let
hostname = "matt-nixos"; hostname = "matt-nixos";
gnome = true; gnome = true;
plasma = false; plasma = false;
# gnome46 = import (builtins.fetchTarball https://github.com/nixos/nixpgs/tarball/gnome-46) { config = config.nixpgs.config; };
in { in {
imports = [ # Include the results of the hardware scan. imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@@ -68,9 +66,6 @@ in {
bootspec.enable = true; bootspec.enable = true;
}; };
# gnome46.services.desktopManager.gnome.enable = true;
# gnome46.services.displayManager.gdm.enable = true;
# Services configs # Services configs
services = { services = {
# Enable the X11 windowing system. # Enable the X11 windowing system.
@@ -80,12 +75,17 @@ in {
# Enable Desktop Environment. # Enable Desktop Environment.
displayManager = { displayManager = {
gdm.enable = gnome; gdm.enable = gnome;
sddm.enable = plasma;
defaultSession = if plasma then "plasma" else "gnome";
}; };
desktopManager.gnome.enable = gnome; desktopManager.gnome.enable = gnome;
}; };
# Enable Desktop Environment.
displayManager = {
sddm.enable = plasma;
defaultSession = if plasma then "plasma" else "gnome";
};
# displayManager.gdm.enable = gnome; # displayManager.gdm.enable = gnome;
# desktopManager.gnome.enable = gnome; # desktopManager.gnome.enable = gnome;
desktopManager.plasma6.enable = plasma; desktopManager.plasma6.enable = plasma;

View File

@@ -15,7 +15,7 @@
fileSystems."/" = { fileSystems."/" = {
device = "none"; device = "none";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=32G" "mode=755" ]; options = [ "defaults" "size=256G" "mode=755" ];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {

View File

@@ -72,7 +72,7 @@
"org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; "org/gnome/desktop/peripherals/mouse".accel-profile = "flat";
"org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true;
"org/gnome/desktop/peripherals/touchpad".tap-to-click = 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/tweaks".show-extensions-notice = false;
"org/gnome/shell".enabled-extensions = [ "org/gnome/shell".enabled-extensions = [
"appindicatorsupport@rgcjonas.gmail.com" "appindicatorsupport@rgcjonas.gmail.com"