diff --git a/flake.lock b/flake.lock index c7e425c..5663e48 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1715091200, - "narHash": "sha256-ca0byu/T6s7OgzS/uq4rP1Z6fmGvBlWWBlk6AxgVAsE=", + "lastModified": 1715607026, + "narHash": "sha256-mjmjNivj8/G3eElwP9OrykecHVh2Lhqry7ztbxfcO54=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0c0c7e5b14a7ad01cc58ad435fa3249cb5f8d87f", + "rev": "f14b61c2cfd4fddcd0028673c3c08f8d75a78d50", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "complement": { "flake": false, "locked": { - "lastModified": 1714472853, - "narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", + "lastModified": 1714661560, + "narHash": "sha256-E1ZiUbOgo7rWo8zt2M2vzCVSykCxK0Ot2dUAxTL6cpU=", "owner": "matrix-org", "repo": "complement", - "rev": "891d18872c153d39a9ce63b545045efddb845738", + "rev": "370a014dca0f720614e0c8f68b9a3e66ecf7f516", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1715064295, - "narHash": "sha256-/JXeVDvv2pkxbIoxmiVw9LwRmj4yMeKqFJN7eukP5G4=", + "lastModified": 1715543662, + "narHash": "sha256-Y+Joq1pMcbVi7qhAyExmd2KRmU0SYx8osUCOy1XnB3s=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "43b07be3fc81f8cabfba193784fb92c997fd2293", + "rev": "434b5118cc41b3359b502794bf3d39583d5f9e26", "type": "github" }, "original": { @@ -409,11 +409,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -449,11 +449,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -486,11 +486,11 @@ ] }, "locked": { - "lastModified": 1714803703, - "narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", + "lastModified": 1715417624, + "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", + "rev": "8fef078acb3206be58ae5892a32d6ed75b695647", "type": "github" }, "original": { @@ -512,11 +512,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715030990, - "narHash": "sha256-7Dtw63tOc/fdSJQD4rMx+eCgNWxkFow3WCQyTQezZKw=", + "lastModified": 1715529584, + "narHash": "sha256-y2XgFHnLpeItAHsyrEWLEHXGRRBe8I/30YU69m9rhso=", "owner": "martinvonz", "repo": "jj", - "rev": "3345e409fc57776bf4855cdb29df5c5f343d5726", + "rev": "256988de65de2fe38eb9a963001f51f138f5cb6f", "type": "github" }, "original": { @@ -619,11 +619,11 @@ ] }, "locked": { - "lastModified": 1714900109, - "narHash": "sha256-+VJWriIMcBv6p+Ri6e/6OWHrItWlunitXPzhfCvj82w=", + "lastModified": 1715574919, + "narHash": "sha256-WXZ27tFG26uVphCQEKVDghyLXCLQnA6fYGnhHGSago4=", "owner": "YaLTeR", "repo": "niri", - "rev": "9847a652af864109b3543e42d48087a38c0729ad", + "rev": "e06776c5d4673de8c2e6c9932cec0c0d761836a8", "type": "github" }, "original": { @@ -745,11 +745,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715010655, - "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -761,12 +761,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", - "revCount": 621993, + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "revCount": 624623, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.621993%2Brev-25865a40d14b3f9cf19f19b924e2ab4069b09588/018f4c66-6d02-7cdf-be60-465b0f46742e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.624623%2Brev-062ca2a9370a27a35c524dc82d540e6e9824b652/018f6cbd-ec88-7bb1-9340-f5e9f881cdb8/source.tar.gz" }, "original": { "type": "tarball", @@ -807,11 +807,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1715542476, + "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19", "type": "github" }, "original": { @@ -823,11 +823,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -884,11 +884,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7efabd5..d062bc7 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ in { # Desktop "matt-nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; modules = [ impermanence.nixosModules.impermanence lanzaboote.nixosModules.lanzaboote @@ -55,6 +56,11 @@ in { home-manager.useUserPackages = true; home-manager.users.matt = import ./hosts/desktop/home.nix; } + + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-gpu-amd + nixos-hardware.nixosModules.common-hidpi + nixos-hardware.nixosModules.common-pc ]; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index b47839d..7e0be53 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ config, outputs, lib, pkgs, ... }: let user = "matt"; password = @@ -108,6 +108,8 @@ in { "org.libreoffice.LibreOffice" "net.davidotek.pupgui2" # Proton-Up Qt "io.github.prateekmedia.appimagepool" + "org.freedesktop.Piper" + "com.usebottles.bottles" ]; }; @@ -188,20 +190,24 @@ in { # Define a user account. Don't forget to set a password with ‘passwd’. users.users."${user}" = { isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "networkmanager" "ratbagd" ]; # Enable ‘sudo’ for the user. shell = pkgs.fish; }; - services.borgbackup.jobs.home-matt = { - paths = "/home/matt"; - encryption.mode = "none"; - # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; - repo = "/media/nas/backup/desktop-nix/home"; - compression = "auto,zstd"; - exclude = [ - "/home/matt/Games" - "/home/matt/1TB" - ]; + services = { + borgbackup.jobs.home-matt = { + paths = "/home/matt"; + encryption.mode = "none"; + # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; + repo = "/media/nas/backup/desktop-nix/home"; + compression = "auto,zstd"; + exclude = [ + "/home/matt/Games" + "/home/matt/1TB" + ]; + }; + + ratbagd.enable = true; }; fileSystems."/media/nas/backup" = { diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 42688b9..bdfe0b3 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -49,7 +49,7 @@ }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/1058-F967"; + device = "/dev/disk/by-uuid/216E-A7AC"; fsType = "vfat"; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 11f2cd2..75994e2 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -81,7 +81,7 @@ "dash-to-panel@jderose9.github.com" "tiling-assistant@leleat-on-github" ]; - "org/gnome/shell/extensions/dash-to-panel".primary-monitor = 0; + "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"; };