diff --git a/flake.lock b/flake.lock index a890938..8d692b0 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ }, "hardware": { "locked": { - "lastModified": 1700559156, - "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=", + "lastModified": 1701020860, + "narHash": "sha256-NwnRn04C8s+hH+KdVtGmVB1FFNIG7DtPJmQSCBDaET4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb", + "rev": "b006ec52fce23b1d57f6ab4a42d7400732e9a0a2", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1700847865, - "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1698826948, - "narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=", + "lastModified": 1700997049, + "narHash": "sha256-2dZsKz6CeKTx76krMp9WV4t+lRs2xDWw0aYNUFgnJKI=", "owner": "viperML", "repo": "nh", - "rev": "23d21975231d569afbe3973eb19d955c650f8f08", + "rev": "4298c924bb6b52607207691af30ebeccdbfa359d", "type": "github" }, "original": { @@ -280,11 +280,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700342017, - "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=", + "lastModified": 1700905716, + "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "decdf666c833a325cb4417041a90681499e06a41", + "rev": "dfb95385d21475da10b63da74ae96d89ab352431", "type": "github" }, "original": { @@ -312,11 +312,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "nixos", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { @@ -391,11 +391,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1700108881, - "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=", + "lastModified": 1700856099, + "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1", + "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", "type": "github" }, "original": { @@ -424,11 +424,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700362823, - "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=", + "lastModified": 1701127353, + "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=", "owner": "Mic92", "repo": "sops-nix", - "rev": "49a87c6c827ccd21c225531e30745a9a6464775c", + "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631", "type": "github" }, "original": { diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 968a5c9..d2e6631 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -1,5 +1,5 @@ -{ config, pkgs, ... }: { - home-manager.users.${config.constants.userName} = { +{ config, pkgs, ... }: let usr = config.constants.userName; in { + home-manager.users.${usr} = { home.packages = with pkgs; [ exactaudiocopy haruna @@ -80,7 +80,7 @@ enable = true; displayManager = { defaultSession = "plasmawayland"; - autoLogin.user = "macronova"; + autoLogin.user = usr; sddm = { enable = true; autoLogin.relogin = true; diff --git a/linux/blitzar/syncthing.nix b/linux/blitzar/syncthing.nix index cb703f4..c77ab34 100644 --- a/linux/blitzar/syncthing.nix +++ b/linux/blitzar/syncthing.nix @@ -3,18 +3,17 @@ { services.syncthing = { enable = true; - dataDir = config.constants.homeDir; openDefaultPorts = true; overrideDevices = true; overrideFolders = true; - settings = { - devices.nebula = { - name = "nebula"; + settings = let media = "nebula"; in { + devices.${media} = { + name = media; id = "KCQSN3M-UWBEDE6-SCS5LS7-WFKFLDK-WT5ECNB-3Z47WAM-ZMA52UL-ZNJUYQ7"; }; folders.music = { enable = true; - devices = [ "nebula" ]; + devices = [ media ]; id = "Music"; label = "Music"; path = "~/Music"; diff --git a/linux/nebula/configuration.nix b/linux/nebula/configuration.nix index 8ee84a7..0c83e1b 100644 --- a/linux/nebula/configuration.nix +++ b/linux/nebula/configuration.nix @@ -26,7 +26,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? + system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/linux/nebula/syncthing.nix b/linux/nebula/syncthing.nix index 0bb67d1..2505ccd 100644 --- a/linux/nebula/syncthing.nix +++ b/linux/nebula/syncthing.nix @@ -3,18 +3,17 @@ { services.syncthing = { enable = true; - dataDir = config.constants.homeDir; openDefaultPorts = true; overrideDevices = true; overrideFolders = true; - settings = { - devices.blitzar = { - name = "blitzar"; + settings = let pc = "blitzar"; in { + devices.${pc} = { + name = pc; id = "JQQYTRP-GEJITYH-NSHUZ2T-YWS5XDC-7R6E47Z-NUXON4D-4QR77VU-AE4Q3AR"; }; folders.music = { enable = true; - devices = [ "blitzar" ]; + devices = [ pc ]; id = "Music"; label = "Music"; path = "~/Music";