mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc updates

Browse Source
This commit is contained in:
mjallen18
2024-05-13 14:56:08 -05:00
parent 09fa42c375
commit 4c1a95d864
5 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
flake.lock generated
View File

@@ -53,11 +53,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1715091200, "lastModified": 1715607026,
"narHash": "sha256-ca0byu/T6s7OgzS/uq4rP1Z6fmGvBlWWBlk6AxgVAsE=", "narHash": "sha256-mjmjNivj8/G3eElwP9OrykecHVh2Lhqry7ztbxfcO54=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "0c0c7e5b14a7ad01cc58ad435fa3249cb5f8d87f", "rev": "f14b61c2cfd4fddcd0028673c3c08f8d75a78d50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -84,11 +84,11 @@
"complement": { "complement": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714472853, "lastModified": 1714661560,
"narHash": "sha256-CNRHSZe3TE+3tFj2dHNyxTMjDqL0MKY3P/3jqUgA7YE=", "narHash": "sha256-E1ZiUbOgo7rWo8zt2M2vzCVSykCxK0Ot2dUAxTL6cpU=",
"owner": "matrix-org", "owner": "matrix-org",
"repo": "complement", "repo": "complement",
"rev": "891d18872c153d39a9ce63b545045efddb845738", "rev": "370a014dca0f720614e0c8f68b9a3e66ecf7f516",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -132,11 +132,11 @@
"rocksdb": "rocksdb" "rocksdb": "rocksdb"
}, },
"locked": { "locked": {
"lastModified": 1715064295, "lastModified": 1715543662,
"narHash": "sha256-/JXeVDvv2pkxbIoxmiVw9LwRmj4yMeKqFJN7eukP5G4=", "narHash": "sha256-Y+Joq1pMcbVi7qhAyExmd2KRmU0SYx8osUCOy1XnB3s=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "43b07be3fc81f8cabfba193784fb92c997fd2293", "rev": "434b5118cc41b3359b502794bf3d39583d5f9e26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -409,11 +409,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715486357,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -429,11 +429,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715486357,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -449,11 +449,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715486357,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -486,11 +486,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714803703, "lastModified": 1715417624,
"narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=", "narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb", "rev": "8fef078acb3206be58ae5892a32d6ed75b695647",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -512,11 +512,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1715030990, "lastModified": 1715529584,
"narHash": "sha256-7Dtw63tOc/fdSJQD4rMx+eCgNWxkFow3WCQyTQezZKw=", "narHash": "sha256-y2XgFHnLpeItAHsyrEWLEHXGRRBe8I/30YU69m9rhso=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "3345e409fc57776bf4855cdb29df5c5f343d5726", "rev": "256988de65de2fe38eb9a963001f51f138f5cb6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -619,11 +619,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714900109, "lastModified": 1715574919,
"narHash": "sha256-+VJWriIMcBv6p+Ri6e/6OWHrItWlunitXPzhfCvj82w=", "narHash": "sha256-WXZ27tFG26uVphCQEKVDghyLXCLQnA6fYGnhHGSago4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "9847a652af864109b3543e42d48087a38c0729ad", "rev": "e06776c5d4673de8c2e6c9932cec0c0d761836a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -745,11 +745,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715010655, "lastModified": 1715148395,
"narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -761,12 +761,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1715447595,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
"revCount": 621993, "revCount": 624623,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -807,11 +807,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1714971268, "lastModified": 1715542476,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -823,11 +823,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1715534503,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -884,11 +884,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1715534503,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@@ -42,6 +42,7 @@ in {
# Desktop # Desktop
"matt-nixos" = nixpkgs.lib.nixosSystem { "matt-nixos" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = {inherit inputs outputs;};
modules = [ modules = [
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
@@ -55,6 +56,11 @@ in {
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.matt = import ./hosts/desktop/home.nix; 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
]; ];
}; };

12
hosts/desktop/configuration.nix
View File

@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page, on # 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`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { config, outputs, lib, pkgs, ... }:
let let
user = "matt"; user = "matt";
password = password =
@@ -108,6 +108,8 @@ in {
"org.libreoffice.LibreOffice" "org.libreoffice.LibreOffice"
"net.davidotek.pupgui2" # Proton-Up Qt "net.davidotek.pupgui2" # Proton-Up Qt
"io.github.prateekmedia.appimagepool" "io.github.prateekmedia.appimagepool"
"org.freedesktop.Piper"
"com.usebottles.bottles"
]; ];
}; };
@@ -188,11 +190,12 @@ in {
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${user}" = { users.users."${user}" = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user. extraGroups = [ "wheel" "networkmanager" "ratbagd" ]; # Enable ‘sudo’ for the user.
shell = pkgs.fish; shell = pkgs.fish;
}; };
services.borgbackup.jobs.home-matt = { services = {
borgbackup.jobs.home-matt = {
paths = "/home/matt"; paths = "/home/matt";
encryption.mode = "none"; encryption.mode = "none";
# environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519"; # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519";
@@ -204,6 +207,9 @@ in {
]; ];
}; };
ratbagd.enable = true;
};
fileSystems."/media/nas/backup" = { fileSystems."/media/nas/backup" = {
device = "//10.0.1.18/Backup"; device = "//10.0.1.18/Backup";
fsType = "cifs"; fsType = "cifs";

2
hosts/desktop/hardware-configuration.nix
View File

@@ -49,7 +49,7 @@
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/1058-F967"; device = "/dev/disk/by-uuid/216E-A7AC";
fsType = "vfat"; fsType = "vfat";
}; };

2
hosts/desktop/home.nix
View File

@@ -81,7 +81,7 @@
"dash-to-panel@jderose9.github.com" "dash-to-panel@jderose9.github.com"
"tiling-assistant@leleat-on-github" "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/gnome/shell/extensions/dash-to-panel".multi-monitors = false;
"org/gtk/settings/file-chooser".clock-format = "12h"; "org/gtk/settings/file-chooser".clock-format = "12h";
}; };