diff options
author | polwex <polwex@sortug.com> | 2024-07-26 19:04:26 +0700 |
---|---|---|
committer | polwex <polwex@sortug.com> | 2024-07-26 19:04:26 +0700 |
commit | 44135f803ead33d0e31c878cd9cf0374a806d274 (patch) | |
tree | 4636f3fd0f3843ea17d1ec22e366dac6ed45fa77 | |
parent | a1e9fe60efbb19ba562a0ef54509c86e21376570 (diff) |
fw
-rw-r--r-- | hosts/local/fw11/hardware-configuration.nix | 7 | ||||
-rw-r--r-- | hosts/local/wayland.nix | 1 | ||||
-rw-r--r-- | hosts/syncthing.nix | 12 | ||||
-rw-r--r-- | outputs.nix | 11 | ||||
-rw-r--r-- | wrappers/chromium/default.nix (renamed from hosts/wrappers/chromium/default.nix) | 0 | ||||
-rw-r--r-- | wrappers/git/default.nix (renamed from hosts/wrappers/git/default.nix) | 0 |
6 files changed, 17 insertions, 14 deletions
diff --git a/hosts/local/fw11/hardware-configuration.nix b/hosts/local/fw11/hardware-configuration.nix index 6b4e8bf..359ff8f 100644 --- a/hosts/local/fw11/hardware-configuration.nix +++ b/hosts/local/fw11/hardware-configuration.nix @@ -15,17 +15,18 @@ # to modeswitch usb dongle sudo usb_modeswitch -KW -v 0bda -p 1a2b fileSystems."/" = - { device = "/dev/disk/by-uuid/349f55f5-8726-47be-826c-33ae8da92346"; + { device = "/dev/disk/by-uuid/176785ba-cd35-4d09-b7df-37e8b9843c33"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/0739-1303"; + { device = "/dev/disk/by-uuid/043D-21E3"; fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/5d13663a-3177-4338-b07a-4b0e10581084"; } + [ ]; # The global useDHCP flag is deprecated, therefore explicitly set to false here. diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix index 256c84d..3b7c6c4 100644 --- a/hosts/local/wayland.nix +++ b/hosts/local/wayland.nix @@ -81,7 +81,6 @@ thunderbird kmail firefox - chromium pavucontrol # icons polkit_gnome diff --git a/hosts/syncthing.nix b/hosts/syncthing.nix index 09b0d9b..48e978d 100644 --- a/hosts/syncthing.nix +++ b/hosts/syncthing.nix @@ -1,9 +1,9 @@ { pkgs, ...}: { - services.syncthing = { - enable = true; - user = "y"; - dataDir = "/home/y/sync/data"; - configDir = "/home/y/sync/.config"; - }; +# services.syncthing = { +# enable = true; +# user = "y"; +# dataDir = "/home/y/sync/data"; +# configDir = "/home/y/sync/.config"; +# }; } diff --git a/outputs.nix b/outputs.nix index 7b2675b..4e93758 100644 --- a/outputs.nix +++ b/outputs.nix @@ -4,10 +4,13 @@ nix-darwin, nur, git-hooks, + wrapper-manager, ... } @ inputs: let + lol = import ./wrappers/ungoogled-chromium; args = {inherit inputs;}; -in { - nixosConfigurations = import ./hosts/nixos.nix args; - darwinConfigurations = import ./hosts/darwin.nix inputs; -} +in + builtins.trace "lol is: ${builtins.toJSON (builtins.deepSeq lol lol)}" { + nixosConfigurations = import ./hosts/nixos.nix args; + darwinConfigurations = import ./hosts/darwin.nix inputs; + } diff --git a/hosts/wrappers/chromium/default.nix b/wrappers/chromium/default.nix index 7f070d2..7f070d2 100644 --- a/hosts/wrappers/chromium/default.nix +++ b/wrappers/chromium/default.nix diff --git a/hosts/wrappers/git/default.nix b/wrappers/git/default.nix index ffea5a4..ffea5a4 100644 --- a/hosts/wrappers/git/default.nix +++ b/wrappers/git/default.nix |