diff --git a/flake.lock b/flake.lock index 2571ce2..23885d9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1704732150, - "narHash": "sha256-GrYUG31hhZTAjNtSN+65jEhN6RoUG+e/rd3sjLeG0Zk=", + "lastModified": 1704803504, + "narHash": "sha256-L9LnVdcdcDT/dwgVTCuDHEbpLeDIAA3Pcsi6s5rfr+w=", "owner": "joinemm", "repo": "bin", - "rev": "5464ce8a20b87de473a237d282fa0d6f2ef41e29", + "rev": "3aa2d1a5688524723b3363a4fe3fa799e5f835b5", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1704676982, - "narHash": "sha256-WnnLhTUkK9zkwW6Sa1PUEztRcF2dxjX/PeokU5C5HBw=", + "lastModified": 1704741201, + "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=", "owner": "nix-community", "repo": "disko", - "rev": "8a9e89d4669c8b6820ae7c7574f68908892fa5f3", + "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704632650, - "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=", + "lastModified": 1704786394, + "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c478b3d56969006e015e55aaece4931f3600c1b2", + "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", "type": "github" }, "original": { @@ -241,11 +241,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1704716895, - "narHash": "sha256-j3MwWzaOX32v5RIYu2zSSnWFc6NheWNN1p6ngEDu0sA=", + "lastModified": 1704755095, + "narHash": "sha256-PVpo40uyt37G6xk+2SJqihxMtr8V5KdZ6h37uWBSZRg=", "owner": "nix-community", "repo": "nixvim", - "rev": "0f1c0bda6dad29b2609cafcea512866b86aa2be5", + "rev": "6645fea915ecf17cf465d544fd42f0f549c00c14", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3e5df02..cec2210 100644 --- a/flake.nix +++ b/flake.nix @@ -55,9 +55,9 @@ specialArgs = {inherit inputs outputs;}; modules = [./hosts/unikie/configuration.nix]; }; - X1 = inputs.nixpkgs.lib.nixosSystem { + x1 = inputs.nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [./hosts/X1/configuration.nix]; + modules = [./hosts/x1/configuration.nix]; }; hetzner = inputs.nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; diff --git a/home-modules/discord.nix b/home-modules/discord.nix index be40200..cccad69 100644 --- a/home-modules/discord.nix +++ b/home-modules/discord.nix @@ -6,7 +6,7 @@ }) ]; xdg.configFile = { - "Vencord/themes/midnight.theme.css".text = '' + "Vencord/settings/quickCss.css".text = '' @import url('https://refact0r.github.io/midnight-discord/midnight.css'); :root { diff --git a/hosts/X1/configuration.nix b/hosts/x1/configuration.nix similarity index 88% rename from hosts/X1/configuration.nix rename to hosts/x1/configuration.nix index 41e62ff..3eddd48 100644 --- a/hosts/X1/configuration.nix +++ b/hosts/x1/configuration.nix @@ -11,7 +11,7 @@ in { imports = lib.flatten [ (with outputs.nixosModules; [ (common {inherit user pkgs outputs;}) - # (syncthing {inherit user config lib;}) + (syncthing {inherit user config lib;}) (docker {inherit user;}) laptop bluetooth @@ -40,19 +40,19 @@ in { }; networking = { - hostName = "buutti"; + hostName = "x1"; # zfs requires hostId to be set. hostId = "c08d7d71"; }; - # services.syncthing = { - # settings.folders = { - # "code".enable = true; - # "notes".enable = true; - # "pictures".enable = true; - # "work".enable = true; - # }; - # }; + services.syncthing = { + settings.folders = { + "code".enable = true; + "notes".enable = true; + "pictures".enable = true; + "work".enable = true; + }; + }; # services.tailscale.enable = true; diff --git a/hosts/x1/hardware-configuration.nix b/hosts/x1/hardware-configuration.nix new file mode 100644 index 0000000..1395fda --- /dev/null +++ b/hosts/x1/hardware-configuration.nix @@ -0,0 +1,57 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "tank/root"; + fsType = "zfs"; + }; + + fileSystems."/home" = + { device = "tank/home"; + fsType = "zfs"; + }; + + fileSystems."/nix" = + { device = "tank/nix"; + fsType = "zfs"; + }; + + fileSystems."/var" = + { device = "tank/var"; + fsType = "zfs"; + }; + + fileSystems."/tmp" = + { device = "tank/tmp"; + fsType = "zfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DE7A-2CD6"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/X1/home.nix b/hosts/x1/home.nix similarity index 99% rename from hosts/X1/home.nix rename to hosts/x1/home.nix index a6b4303..3240bc3 100644 --- a/hosts/X1/home.nix +++ b/hosts/x1/home.nix @@ -25,7 +25,6 @@ in { ssh-personal ssh-work dunst - hidpi rofi discord ]) diff --git a/modules/syncthing.nix b/modules/syncthing.nix index 8f81483..8eda09b 100644 --- a/modules/syncthing.nix +++ b/modules/syncthing.nix @@ -9,7 +9,7 @@ enable = true; group = "users"; - dataDir = lib.mkDefault "/home/${user}/"; + dataDir = lib.mkDefault "/home/${user}"; configDir = "/home/${user}/.config/syncthing"; openDefaultPorts = true; @@ -24,6 +24,7 @@ "windows" = {id = "3D3Z5N4-JLIWTGO-IJFSPLG-VWEJNH6-WLQDBMH-UCIMAWB-ONWDSP6-7NCL7AU";}; "unikie" = {id = "J4ASID7-BTVUC22-MMVY2GJ-A6YIMQI-PMBRV7S-FIN7OTV-PNPCV62-6GY7AAF";}; "buutti" = {id = "WSCI2BT-CE75BLT-RLRMHDO-SARY35B-I7KGQ4I-2U6S6OP-IWAO6UH-MMOU7Q6";}; + "x1" = {id = "HQZRDQW-EUEUGNR-M4X3NLQ-KSQXR27-UKTBJIE-GXXVN3K-AW7IW4D-ZHGKXQD";}; }; folders = let dir = config.services.syncthing.dataDir;