From 1d9644dcbc6ed91a85264dbc4ac49d8fcb853085 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 20 May 2024 22:40:56 +0200 Subject: [PATCH 01/14] fix lua, maybe bend now --- common/nvim/init.lua | 7 +++--- common/nvim/nvim.nix | 1 - flake.nix | 57 +++++++++++++++++++++--------------------- hosts/default/home.nix | 2 ++ 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/common/nvim/init.lua b/common/nvim/init.lua index 5491b53..10eaa50 100644 --- a/common/nvim/init.lua +++ b/common/nvim/init.lua @@ -52,8 +52,9 @@ vim.opt.list = true vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } -- make tabs a reasonable width -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 -- Preview substitutions live, as you type! vim.opt.inccommand = "split" @@ -157,7 +158,7 @@ require("lazy").setup({ "tpope/vim-fugitive", -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically + -- "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following diff --git a/common/nvim/nvim.nix b/common/nvim/nvim.nix index e726057..2318ce7 100644 --- a/common/nvim/nvim.nix +++ b/common/nvim/nvim.nix @@ -7,7 +7,6 @@ # TODO: find how I can make this build dependencies only gnumake - cargo rustc python3 ]; diff --git a/flake.nix b/flake.nix index 22aa857..8cabacf 100644 --- a/flake.nix +++ b/flake.nix @@ -16,13 +16,13 @@ }; automapaper = { - url = "github:itepastra/automapaper"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:itepastra/automapaper"; + inputs.nixpkgs.follows = "nixpkgs"; }; nix-minecraft = { - url = "github:Infinidoge/nix-minecraft"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:Infinidoge/nix-minecraft"; + inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { @@ -36,13 +36,13 @@ }; disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; }; lazy = { - url = "github:bobvanderlinden/nixos-config"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:bobvanderlinden/nixos-config"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -51,28 +51,27 @@ { nixosConfigurations = { lambdaOS = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - inherit nix-colors; - inherit automapaper; - }; - modules = [ - ./hosts/default/configuration.nix - inputs.home-manager.nixosModules.default - ]; - }; + specialArgs = { + inherit inputs; + inherit nix-colors; + inherit automapaper; + }; + modules = [ + ./hosts/default/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; NoasServer = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - inherit nix-colors; - }; - modules = [ - disko.nixosModules.disko - ./hosts/server/configuration.nix - inputs.home-manager.nixosModules.default - ]; - }; + specialArgs = { + inherit inputs; + inherit nix-colors; + }; + modules = [ + disko.nixosModules.disko + ./hosts/server/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; }; - }; } diff --git a/hosts/default/home.nix b/hosts/default/home.nix index b4881af..7a367af 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -66,6 +66,8 @@ nodejs opam stack + rustup + bend localsend ]; From 5fb2fe61ed1c9f725e93c74e0a63aa60573e4359 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 20 May 2024 22:42:28 +0200 Subject: [PATCH 02/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/5f6dbcce99d60dd77f96dfc66d06bbea149a40e1' (2024-05-16) → 'github:nix-community/disko/6f01b9710bc4d3bf006eb8df928b4b15e0430901' (2024-05-20) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=2ead1fd22103ce065661555513bace5897083ded' (2024-05-17) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=f8857e6072bd85b95393499688872aaf7f088b5b' (2024-05-18) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/0e7e9e6919e4082f7add31892d1864e9d8fd6e8d' (2024-05-18) → 'github:Infinidoge/nix-minecraft/bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b' (2024-05-20) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15) → 'github:nixos/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19) --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 8c30b51..21c4198 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1715872464, - "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=", + "lastModified": 1716168343, + "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", "owner": "nix-community", "repo": "disko", - "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1", + "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1715972853, - "narHash": "sha256-medEslUynA9952HeEdYNxGYZyyMz+hEEgV6RV31pvvc=", + "lastModified": 1716063601, + "narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=", "ref": "refs/heads/main", - "rev": "2ead1fd22103ce065661555513bace5897083ded", - "revCount": 4717, + "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", + "revCount": 4719, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1715995260, - "narHash": "sha256-3ASn2z6I9RL4ws4D6paZdVv1Z2UVBa0hxx+BhRON9/Q=", + "lastModified": 1716168130, + "narHash": "sha256-Oyg6eNhZVsXeOE4iszntTskAuK3vJvHUj2XxXIR+xGc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "0e7e9e6919e4082f7add31892d1864e9d8fd6e8d", + "rev": "bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { From 8ff82f9b1c5a7ccb8ac276a6c30918e41cf0f8e2 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 20 May 2024 22:46:42 +0200 Subject: [PATCH 03/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/6c0b7a92c30122196a761b440ac0d46d3d9954f1' (2024-05-19) → 'github:nixos/nixpkgs/4c0171822671f5f87761852c1ce591a8c7e36a8b' (2024-05-20) --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 21c4198..b277905 100644 --- a/flake.lock +++ b/flake.lock @@ -575,16 +575,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716137900, - "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", + "lastModified": 1716236596, + "narHash": "sha256-HUYXLWOst0tPXDVjWbuzamq8rVXxATQgbnwTe0doJmA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", + "rev": "4c0171822671f5f87761852c1ce591a8c7e36a8b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } From dbe29910f0f0a539d40df72c89589283d02caf1c Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 01:10:04 +0200 Subject: [PATCH 04/14] nixpkgs master instead --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 8cabacf..1dde18b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/d8e0944e6d2ce0f326040e654c07a410e2617d47"; From 799b62a43a7789647222c5404f391c45e40b7c4f Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 01:10:47 +0200 Subject: [PATCH 05/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4c0171822671f5f87761852c1ce591a8c7e36a8b' (2024-05-20) → 'github:nixos/nixpkgs/c730ac0d38ac3f75213f876135d24706e6b33165' (2024-05-20) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b277905..5f610e4 100644 --- a/flake.lock +++ b/flake.lock @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716236596, - "narHash": "sha256-HUYXLWOst0tPXDVjWbuzamq8rVXxATQgbnwTe0doJmA=", + "lastModified": 1716246486, + "narHash": "sha256-4HvUF74xin6WvNs96S8RW1ywbYxzqAWlFPsXeTSX3sA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c0171822671f5f87761852c1ce591a8c7e36a8b", + "rev": "c730ac0d38ac3f75213f876135d24706e6b33165", "type": "github" }, "original": { From e644149258aa18004c93a54fb0d5909fae16cd8d Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 16:55:29 +0200 Subject: [PATCH 06/14] activate syncthing --- hosts/default/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index f23d6d2..33102ab 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -224,6 +224,12 @@ settings.PasswordAuthentication = false; settings.KbdInteractiveAuthentication = false; }; + syncthing = { + enable = true; + user = "noa"; + dataDir = "/home/noa/Syncthing"; + configDir = "/home/noa/Syncthing/.config/syncthing"; + }; xserver = { enable = true; xkb = { From 3d5e41364bc4275899041f4b108457c629482b93 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 16:56:54 +0200 Subject: [PATCH 07/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/6f01b9710bc4d3bf006eb8df928b4b15e0430901' (2024-05-20) → 'github:nix-community/disko/f1654e07728008d354c704d265fc710e3f5f42ee' (2024-05-21) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=f8857e6072bd85b95393499688872aaf7f088b5b' (2024-05-18) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=baef55da1ddccf8ca1b831214bb96e523b600a28' (2024-05-21) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b' (2024-05-20) → 'github:Infinidoge/nix-minecraft/ca3b4ad1a56802d32aece874f69d3168c766591c' (2024-05-21) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/c730ac0d38ac3f75213f876135d24706e6b33165' (2024-05-20) → 'github:nixos/nixpkgs/b52519c0fb075f0fe8d2655c44a0418eb0f0140c' (2024-05-21) --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 5f610e4..6369f8e 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1716168343, - "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", + "lastModified": 1716291492, + "narHash": "sha256-Qvfoa99WdYIneGrrLFIKQCevLgB5vnxvwJe5aWbGYZY=", "owner": "nix-community", "repo": "disko", - "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", + "rev": "f1654e07728008d354c704d265fc710e3f5f42ee", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716063601, - "narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=", + "lastModified": 1716295833, + "narHash": "sha256-zrVYmWVmJOq4kZQf1s8m4ZY2cZSShb6oE50DR2vzDZc=", "ref": "refs/heads/main", - "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", - "revCount": 4719, + "rev": "baef55da1ddccf8ca1b831214bb96e523b600a28", + "revCount": 4720, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1716168130, - "narHash": "sha256-Oyg6eNhZVsXeOE4iszntTskAuK3vJvHUj2XxXIR+xGc=", + "lastModified": 1716254492, + "narHash": "sha256-HZRILu9aa0upyfTaVWFLqTCOG+xNA7i49aTppDv0tvc=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "bd9c8fb22af7f74a63e36c426d16c3890cb2eb9b", + "rev": "ca3b4ad1a56802d32aece874f69d3168c766591c", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716246486, - "narHash": "sha256-4HvUF74xin6WvNs96S8RW1ywbYxzqAWlFPsXeTSX3sA=", + "lastModified": 1716303272, + "narHash": "sha256-qlUs/0UoAmfA17ebqYKByzwoQzgN+iPPH9Y+FCb/htA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c730ac0d38ac3f75213f876135d24706e6b33165", + "rev": "b52519c0fb075f0fe8d2655c44a0418eb0f0140c", "type": "github" }, "original": { From db4596100e0b923a689821d1fb1fecab1a0202d6 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 18:44:43 +0200 Subject: [PATCH 08/14] add ssd for backups --- hosts/default/hardware-configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index 17ffb75..50c251d 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -23,6 +23,11 @@ fsType = "vfat"; }; + fileSystems."/home/noa/Syncthing" = { + device = "/dev/disk/by-id/wwn-0x55cd2e414dd065e2-part1"; + fsType = "ext4"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From 30a527830d0420efc55f2da160a74501befbbddb Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 18:51:17 +0200 Subject: [PATCH 09/14] undo broken --- hosts/default/hardware-configuration.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index 50c251d..17ffb75 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -23,11 +23,6 @@ fsType = "vfat"; }; - fileSystems."/home/noa/Syncthing" = { - device = "/dev/disk/by-id/wwn-0x55cd2e414dd065e2-part1"; - fsType = "ext4"; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From c799d43db509c0d31fe84bf86d4ba2bc964c45f5 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 21 May 2024 18:59:20 +0200 Subject: [PATCH 10/14] disable ghost third monitor --- modules/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 98bec59..729d80f 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -67,6 +67,7 @@ in monitor = [ "DP-3,2560x1440@360,2560x0,1" "DP-2,2560x1440@144,0x0,1" + "Unknown-1,disable" # NOTE: due to a driver bug a third monitor appears ]; windowrulev2 = [ "opacity 1.0 0.6,class:^(kitty)$" From 3082200a750f513346490e4ad6592b5069fb4d8a Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 23 May 2024 03:13:47 +0200 Subject: [PATCH 11/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/f1654e07728008d354c704d265fc710e3f5f42ee' (2024-05-21) → 'github:nix-community/disko/23c63fb09334c3e8958b57e2ddc3870b75b9111d' (2024-05-22) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=baef55da1ddccf8ca1b831214bb96e523b600a28' (2024-05-21) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=7ad9116de8d0b7dac27eaf080bd92998a8fb40e5' (2024-05-22) • Updated input 'hyprland/hyprcursor': 'github:hyprwm/hyprcursor/7c3aa03dffb53921e583ade3d4ae3f487e390e7e' (2024-05-15) → 'github:hyprwm/hyprcursor/27ca640abeef2d425b5dbecf804f5eb622cef56d' (2024-05-21) • Updated input 'hyprland/hyprwayland-scanner': 'github:hyprwm/hyprwayland-scanner/f5181a068c1b06f2db51f6222e50a0c665a2b0c3' (2024-05-16) → 'github:hyprwm/hyprwayland-scanner/3afed4364790aebe0426077631af1e164a9650cc' (2024-05-18) • Updated input 'hyprland/xdph': 'github:hyprwm/xdg-desktop-portal-hyprland/af7c87a32f5d67eb2ada908a6a700f4e74831943' (2024-05-15) → 'github:hyprwm/xdg-desktop-portal-hyprland/91e48d6acd8a5a611d26f925e51559ab743bc438' (2024-05-21) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/ca3b4ad1a56802d32aece874f69d3168c766591c' (2024-05-21) → 'github:Infinidoge/nix-minecraft/16f3a2a52bfa7ab58283d96ec5b0b00ad8d26348' (2024-05-22) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b52519c0fb075f0fe8d2655c44a0418eb0f0140c' (2024-05-21) → 'github:nixos/nixpkgs/a520740e16adf7429590147888a62a1661a41730' (2024-05-23) --- flake.lock | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 6369f8e..1b21138 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1716291492, - "narHash": "sha256-Qvfoa99WdYIneGrrLFIKQCevLgB5vnxvwJe5aWbGYZY=", + "lastModified": 1716394172, + "narHash": "sha256-B+pNhV8GFeCj9/MoH+qtGqKbgv6fU4hGaw2+NoYYtB0=", "owner": "nix-community", "repo": "disko", - "rev": "f1654e07728008d354c704d265fc710e3f5f42ee", + "rev": "23c63fb09334c3e8958b57e2ddc3870b75b9111d", "type": "github" }, "original": { @@ -266,11 +266,11 @@ ] }, "locked": { - "lastModified": 1715791817, - "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", + "lastModified": 1716327911, + "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", + "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716295833, - "narHash": "sha256-zrVYmWVmJOq4kZQf1s8m4ZY2cZSShb6oE50DR2vzDZc=", + "lastModified": 1716417827, + "narHash": "sha256-TYHpA/i9+Ns01+RzknJ5eYskQXL9GTTA7JX9Lo4JKVg=", "ref": "refs/heads/main", - "rev": "baef55da1ddccf8ca1b831214bb96e523b600a28", - "revCount": 4720, + "rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", + "revCount": 4728, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -390,11 +390,11 @@ ] }, "locked": { - "lastModified": 1715879663, - "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1716254492, - "narHash": "sha256-HZRILu9aa0upyfTaVWFLqTCOG+xNA7i49aTppDv0tvc=", + "lastModified": 1716340935, + "narHash": "sha256-bWt/cLN+5xkHannfPvHEiLzIAoCfTFpiseWusQVYhC0=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ca3b4ad1a56802d32aece874f69d3168c766591c", + "rev": "16f3a2a52bfa7ab58283d96ec5b0b00ad8d26348", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716303272, - "narHash": "sha256-qlUs/0UoAmfA17ebqYKByzwoQzgN+iPPH9Y+FCb/htA=", + "lastModified": 1716426777, + "narHash": "sha256-DQGfL1XBQ2xcHrhzpV4byQOtTEh8b0g3acfANgBsNYI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b52519c0fb075f0fe8d2655c44a0418eb0f0140c", + "rev": "a520740e16adf7429590147888a62a1661a41730", "type": "github" }, "original": { @@ -740,11 +740,11 @@ ] }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { From 7f68eb452e82786507b68f15811dc193cf8d533b Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 23 May 2024 13:03:32 +0200 Subject: [PATCH 12/14] add syncthing partition --- hosts/default/hardware-configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index 17ffb75..147db86 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -23,6 +23,11 @@ fsType = "vfat"; }; + fileSystems."/home/noa/Syncthing" = + { device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8"; + fsType = "ext4"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking From 70b9c7c16d55728db2ea0a85968a8f293b5be662 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 23 May 2024 13:06:45 +0200 Subject: [PATCH 13/14] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/23c63fb09334c3e8958b57e2ddc3870b75b9111d' (2024-05-22) → 'github:nix-community/disko/7ffc4354dfeb37c8c725ae1465f04a9b45ec8606' (2024-05-23) • Updated input 'home-manager': 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17) → 'github:nix-community/home-manager/850cb322046ef1a268449cf1ceda5fd24d930b05' (2024-05-23) • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=7ad9116de8d0b7dac27eaf080bd92998a8fb40e5' (2024-05-22) → 'git+https://github.com/hyprwm/Hyprland?ref=refs/heads/main&rev=25b9446949bf12a2bfc1b9a38b4ccac78a06b32d' (2024-05-23) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/16f3a2a52bfa7ab58283d96ec5b0b00ad8d26348' (2024-05-22) → 'github:Infinidoge/nix-minecraft/b310a08404315f59a9f15eb01aa04dd006afc7ca' (2024-05-23) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/a520740e16adf7429590147888a62a1661a41730' (2024-05-23) → 'github:nixos/nixpkgs/07f97058e9b299fabb746391fcdca73166acb516' (2024-05-23) --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 1b21138..0b18a5e 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1716394172, - "narHash": "sha256-B+pNhV8GFeCj9/MoH+qtGqKbgv6fU4hGaw2+NoYYtB0=", + "lastModified": 1716431128, + "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", "owner": "nix-community", "repo": "disko", - "rev": "23c63fb09334c3e8958b57e2ddc3870b75b9111d", + "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716417827, - "narHash": "sha256-TYHpA/i9+Ns01+RzknJ5eYskQXL9GTTA7JX9Lo4JKVg=", + "lastModified": 1716462072, + "narHash": "sha256-MmwWogK4x+mVjTCnlUAIGKv9bTJ0NX41sScRtmusw+k=", "ref": "refs/heads/main", - "rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", - "revCount": 4728, + "rev": "25b9446949bf12a2bfc1b9a38b4ccac78a06b32d", + "revCount": 4729, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1716340935, - "narHash": "sha256-bWt/cLN+5xkHannfPvHEiLzIAoCfTFpiseWusQVYhC0=", + "lastModified": 1716427297, + "narHash": "sha256-MkT6Mw0heLGt5TE9LjKAo+LLG9sSzhmpLj+U4cOyB2c=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "16f3a2a52bfa7ab58283d96ec5b0b00ad8d26348", + "rev": "b310a08404315f59a9f15eb01aa04dd006afc7ca", "type": "github" }, "original": { @@ -575,11 +575,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716426777, - "narHash": "sha256-DQGfL1XBQ2xcHrhzpV4byQOtTEh8b0g3acfANgBsNYI=", + "lastModified": 1716462053, + "narHash": "sha256-l6n8UpcJrMryvAFsxOjCetXrgycm+WMfo/GBlWWrGfg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a520740e16adf7429590147888a62a1661a41730", + "rev": "07f97058e9b299fabb746391fcdca73166acb516", "type": "github" }, "original": { From ec8754ad611f19198cf307b2848d223daf7e41e4 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Thu, 23 May 2024 13:32:25 +0200 Subject: [PATCH 14/14] Syncthing -> Sync --- hosts/default/configuration.nix | 4 ++-- hosts/default/hardware-configuration.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 33102ab..d3c91d5 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -227,8 +227,8 @@ syncthing = { enable = true; user = "noa"; - dataDir = "/home/noa/Syncthing"; - configDir = "/home/noa/Syncthing/.config/syncthing"; + dataDir = "/home/noa/Sync"; + configDir = "/home/noa/Sync/.config/syncthing"; }; xserver = { enable = true; diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index 147db86..0ea374a 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -23,7 +23,7 @@ fsType = "vfat"; }; - fileSystems."/home/noa/Syncthing" = + fileSystems."/home/noa/Sync" = { device = "/dev/disk/by-uuid/93a74173-8719-4be2-86b3-dc80588b9cf8"; fsType = "ext4"; };