diff --git a/.re-commit-config.yaml b/.re-commit-config.yaml deleted file mode 120000 index b19354f..0000000 --- a/.re-commit-config.yaml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/0nibh6zrkxhh7qc1q6kkq5810iqd0059-pre-commit-config.json \ No newline at end of file diff --git a/ada/default.nix b/ada/default.nix deleted file mode 100644 index 483d476..0000000 --- a/ada/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{self, ...}: { - imports = [ - "${self}/ada/boot/initrd.nix" - "${self}/ada/boot/kernel.nix" - "${self}/ada/boot/lanzaboote.nix" - "${self}/ada/boot/plymouth.nix" - "${self}/ada/boot/tmp.nix" - "${self}/ada/boot/loader/systemd-boot.nix" - - "${self}/ada/disko/disk.nix" - "${self}/ada/disko/lvm_vg.nix" - - "${self}/ada/console/console.nix" - - "${self}/ada/environment/systemPackages.nix" - "${self}/ada/environment/variables.nix" - - "${self}/ada/hardware/amdgpu.nix" - "${self}/ada/hardware/cpu.nix" - "${self}/ada/hardware/graphics.nix" - "${self}/ada/hardware/qmk.nix" - "${self}/ada/hardware/zram.nix" - "${self}/ada/hardware/bluetooth.nix" - "${self}/ada/hardware/" - - "${self}/ada/home-manager/users.nix" - - "${self}/ada/i18n/locales.nix" - - "${self}/ada/networking/dhcp.nix" - "${self}/ada/networking/firewall.nix" - "${self}/ada/networking/hostname.nix" - "${self}/ada/networking/networkmanager.nix" - "${self}/ada/networking/wireguard.nix" - "${self}/ada/networking/nameservers.nix" - "${self}/ada/networking/hosts.nix" - "${self}/ada/networking/hostId.nix" - - "${self}/ada/nix/package.nix" - "${self}/ada/nix/settings/allowed-users.nix" - "${self}/ada/nix/settings/experimental-features.nix" - "${self}/ada/nix/settings/substituters.nix" - "${self}/ada/nix/settings/trusted-public-keys.nix" - "${self}/ada/nix/settings/trusted-substituters.nix" - "${self}/ada/nix/settings/trusted-users.nix" - "${self}/ada/nix/settings/auto-optimise-store.nix" - - "${self}/ada/nixpkgs/config.nix" - "${self}/ada/nixpkgs/system.nix" - - "${self}/ada/programs/gamescope.nix" - "${self}/ada/programs/gamemode.nix" - "${self}/ada/programs/nh.nix" - "${self}/ada/programs/steam.nix" - "${self}/ada/programs/ssh.nix" - "${self}/ada/programs/yubikey-touch-detector.nix" - "${self}/ada/programs/nekoray.nix" - - "${self}/ada/security/polkit.nix" - "${self}/ada/security/rtkit.nix" - "${self}/ada/security/sudo.nix" - "${self}/ada/security/sudo-rs.nix" - "${self}/ada/security/pam/yubico.nix" - - "${self}/ada/services/greetd.nix" - "${self}/ada/services/libinput.nix" - "${self}/ada/services/openssh.nix" - "${self}/ada/services/pipewire.nix" - "${self}/ada/services/netbird.nix" - "${self}/ada/services/qmk.nix" - "${self}/ada/services/scx.nix" - "${self}/ada/services/xserver.nix" - "${self}/ada/services/sunshine.nix" - "${self}/ada/services/usbmuxd.nix" - "${self}/ada/services/irqbalance.nix" - "${self}/ada/services/yubikey-agent.nix" - "${self}/ada/services/resolved.nix" - "${self}/ada/services/firewalld.nix" - - "${self}/ada/sops/defaults.nix" - "${self}/ada/sops/secrets.nix" - - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" - - "${self}/ada/system/name.nix" - "${self}/ada/system/stateVersion.nix" - - "${self}/ada/systemd/oomd.nix" - "${self}/ada/systemd/slices/system-slice.nix" - "${self}/ada/systemd/slices/user-slice.nix" - "${self}/ada/systemd/slices/root-slice.nix" - - "${self}/ada/time/timeZone.nix" - - "${self}/ada/users/users/hand7s.nix" - "${self}/ada/users/users/root.nix" - "${self}/ada/users/mutableUsers.nix" - - "${self}/ada/xdg/icons.nix" - "${self}/ada/xdg/mime.nix" - "${self}/ada/xdg/portal.nix" - ]; -} diff --git a/ada/hardware/bluetooth.nix b/ada/hardware/bluetooth.nix deleted file mode 100644 index d3576ae..0000000 --- a/ada/hardware/bluetooth.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - hardware = { - bluetooth = { - enable = true; - }; - }; -} diff --git a/ada/hardware/default.nix b/ada/hardware/default.nix deleted file mode 100644 index 9f37847..0000000 --- a/ada/hardware/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - hardware = { - enableAllFirmware = true; - enableAllHardware = true; - enableRedistributableFirmware = true; - firmwareCompression = "zstd"; - }; -} diff --git a/ada/home-manager/users.nix b/ada/home-manager/users.nix deleted file mode 100644 index 6590188..0000000 --- a/ada/home-manager/users.nix +++ /dev/null @@ -1,27 +0,0 @@ -{self, ...}: { - home-manager = { - users = { - "hand7s" = { - imports = [ - "${self}/hand7s/" - self.inputs.agenix.homeManagerModules.default - self.inputs.spicetify-nix.homeManagerModules.default - self.inputs.hyprland.homeManagerModules.default - self.inputs.chaotic.homeManagerModules.default - self.inputs.sops-nix.homeManagerModules.sops - - self.inputs.nix-index-database.homeModules.nix-index - self.inputs.noctalia.homeModules.default - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - self - ; - }; - }; -} diff --git a/ada/networking/firewall.nix b/ada/networking/firewall.nix deleted file mode 100644 index b85bbd4..0000000 --- a/ada/networking/firewall.nix +++ /dev/null @@ -1,14 +0,0 @@ -_: { - networking = { - firewall = { - allowPing = true; - enable = false; - checkReversePath = false; - }; - - nftables = { - enable = true; - flattenRulesetFile = true; - }; - }; -} diff --git a/ada/networking/hostId.nix b/ada/networking/hostId.nix deleted file mode 100644 index 585868c..0000000 --- a/ada/networking/hostId.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - networking = { - hostId = "5c79d468"; - }; -} diff --git a/ada/networking/hostname.nix b/ada/networking/hostname.nix deleted file mode 100644 index f8b1373..0000000 --- a/ada/networking/hostname.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - networking = { - hostName = "ada"; - }; -} diff --git a/ada/networking/timeServers.nix b/ada/networking/timeServers.nix deleted file mode 100644 index 9289ea6..0000000 --- a/ada/networking/timeServers.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - networking = { - timeServers = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; - }; -} diff --git a/ada/networking/wireguard.nix b/ada/networking/wireguard.nix deleted file mode 100644 index bd2336c..0000000 --- a/ada/networking/wireguard.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - networking = { - wireguard = { - enable = true; - }; - }; -} diff --git a/ada/nix/settings/substituters.nix b/ada/nix/settings/substituters.nix deleted file mode 100644 index da0035f..0000000 --- a/ada/nix/settings/substituters.nix +++ /dev/null @@ -1,19 +0,0 @@ -_: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - # nix-community - "https://hydra.nix-community.org/" - ]; - }; - }; -} diff --git a/ada/nix/settings/trusted-users.nix b/ada/nix/settings/trusted-users.nix deleted file mode 100644 index 4eee825..0000000 --- a/ada/nix/settings/trusted-users.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - nix = { - settings = { - trusted-users = [ - "@wheel" - ]; - }; - }; -} diff --git a/ada/security/pam/yubico.nix b/ada/security/pam/yubico.nix deleted file mode 100644 index cd8a4a1..0000000 --- a/ada/security/pam/yubico.nix +++ /dev/null @@ -1,15 +0,0 @@ -_: { - security = { - pam = { - yubico = { - enable = false; - debug = true; - mode = "challenge-response"; - control = "sufficient"; - id = [ - "1873055870" - ]; - }; - }; - }; -} diff --git a/ada/services/firewalld.nix b/ada/services/firewalld.nix deleted file mode 100644 index 7cd83ae..0000000 --- a/ada/services/firewalld.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - services = { - firewalld = { - enable = true; - - settings = { - # nope - }; - - zones = { - # nope - }; - }; - }; -} diff --git a/ada/services/openssh.nix b/ada/services/openssh.nix deleted file mode 100644 index 71ee4c2..0000000 --- a/ada/services/openssh.nix +++ /dev/null @@ -1,22 +0,0 @@ -{config, ...}: { - services = { - openssh = { - enable = true; - allowSFTP = true; - openFirewall = true; - ports = [ - 53864 - ]; - - settings = { - PrintMotd = false; - PermitRootLogin = "no"; - PasswordAuthentication = false; - }; - - authorizedKeysFiles = [ - config.sops.secrets.sshKey.path - ]; - }; - }; -} diff --git a/ada/services/pipewire.nix b/ada/services/pipewire.nix deleted file mode 100644 index 43a9f4e..0000000 --- a/ada/services/pipewire.nix +++ /dev/null @@ -1,66 +0,0 @@ -_: { - services = { - pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - - audio = { - enable = true; - }; - - pulse = { - enable = true; - }; - - jack = { - enable = true; - }; - - wireplumber = { - enable = true; - }; - - extraConfig = { - pipewire = { - # PIPEWIRE_PROPS=node.force-rate=0 - "92-low-latency" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 88200 - 96000 - ]; - - "default.clock.min-quantum" = 512; - "default.clock.quantum" = 4096; - "default.clock.max-quantum" = 8192; - }; - }; - - "93-no-resampling" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - 192000 - ]; - }; - }; - - "94-no-upmixing" = { - "stream.properties" = { - "channelmix.upmix" = false; - }; - }; - }; - }; - }; - }; -} diff --git a/ada/services/resolved.nix b/ada/services/resolved.nix deleted file mode 100644 index 8c268e8..0000000 --- a/ada/services/resolved.nix +++ /dev/null @@ -1,39 +0,0 @@ -_: { - services = { - resolved = { - enable = true; - dnsovertls = "true"; - dnssec = "true"; - llmnr = "true"; - domains = [ - "~." - ]; - - fallbackDns = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" - - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" - - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" - - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; - }; -} diff --git a/ada/services/scx.nix b/ada/services/scx.nix deleted file mode 100644 index 2ab435e..0000000 --- a/ada/services/scx.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - services = { - scx = { - enable = true; - scheduler = "scx_cosmos"; - }; - }; -} diff --git a/ada/services/sunshine.nix b/ada/services/sunshine.nix deleted file mode 100644 index 25a9a56..0000000 --- a/ada/services/sunshine.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - services = { - sunshine = { - enable = true; - capSysAdmin = true; - openFirewall = true; - autoStart = true; - }; - }; -} diff --git a/ada/services/yggdrasil.nix b/ada/services/yggdrasil.nix deleted file mode 100644 index c24275b..0000000 --- a/ada/services/yggdrasil.nix +++ /dev/null @@ -1,11 +0,0 @@ -_: { - services = { - yggdrasil = { - enable = false; - persistentKeys = false; - settings = { - # nope - }; - }; - }; -} diff --git a/ada/systemd/slices/root-slice.nix b/ada/systemd/slices/root-slice.nix deleted file mode 100644 index 6a386e9..0000000 --- a/ada/systemd/slices/root-slice.nix +++ /dev/null @@ -1,14 +0,0 @@ -_: { - systemd = { - slices = { - root = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; - }; - }; -} diff --git a/ada/systemd/slices/system-slice.nix b/ada/systemd/slices/system-slice.nix deleted file mode 100644 index 4de4bba..0000000 --- a/ada/systemd/slices/system-slice.nix +++ /dev/null @@ -1,14 +0,0 @@ -_: { - systemd = { - slices = { - system = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; - }; - }; -} diff --git a/ada/users/users/root.nix b/ada/users/users/root.nix deleted file mode 100644 index faa89b7..0000000 --- a/ada/users/users/root.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - users = { - users = { - "root" = { - initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; - }; - }; - }; -} diff --git a/ada/xdg/icons.nix b/ada/xdg/icons.nix deleted file mode 100644 index 7c75adf..0000000 --- a/ada/xdg/icons.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - xdg = { - icons = { - enable = true; - }; - }; -} diff --git a/ada/xdg/mime.nix b/ada/xdg/mime.nix deleted file mode 100644 index 9197f59..0000000 --- a/ada/xdg/mime.nix +++ /dev/null @@ -1,11 +0,0 @@ -_: { - xdg = { - mime = { - enable = true; - defaultApplications = { - "x-scheme-handler/http" = "google-chrome.desktop"; - "x-scheme-handler/https" = "google-chrome.desktop"; - }; - }; - }; -} diff --git a/flake.lock b/flake.lock index d0f20c5..4a44f6d 100644 --- a/flake.lock +++ b/flake.lock @@ -240,38 +240,6 @@ "type": "github" } }, - "cachyos-kernel": { - "flake": false, - "locked": { - "lastModified": 1770408132, - "narHash": "sha256-H2J5KHGAfzmr/SBNqWDj52bS76n/IRijOA1A2XerS90=", - "owner": "CachyOS", - "repo": "linux-cachyos", - "rev": "94b35b638d970d70a354432d863e5fdf39238e44", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "linux-cachyos", - "type": "github" - } - }, - "cachyos-kernel-patches": { - "flake": false, - "locked": { - "lastModified": 1770407844, - "narHash": "sha256-gDCdcoHtoaEuFP+aVvf43NaJW2RclTVIBZix548BdhQ=", - "owner": "CachyOS", - "repo": "kernel-patches", - "rev": "c031bd5a91990f7eab3d8fb364836cf4e1960f31", - "type": "github" - }, - "original": { - "owner": "CachyOS", - "repo": "kernel-patches", - "type": "github" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -505,38 +473,6 @@ } }, "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_11": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_12": { "flake": false, "locked": { "lastModified": 1765121682, @@ -651,31 +587,33 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } }, "flake-compat_9": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-parts": { @@ -699,45 +637,6 @@ "type": "github" } }, - "flake-parts_10": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_6" - }, - "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_11": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -835,42 +734,6 @@ } }, "flake-parts_7": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_4" - }, - "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_8": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_5" - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_9": { "inputs": { "nixpkgs-lib": [ "nixos-anywhere", @@ -891,6 +754,45 @@ "type": "github" } }, + "flake-parts_8": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -925,25 +827,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -1619,34 +1503,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nix-bwrapper", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nix-bwrapper", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -1711,25 +1567,6 @@ "type": "github" } }, - "ndg": { - "inputs": { - "nixpkgs": "nixpkgs_16" - }, - "locked": { - "lastModified": 1768214250, - "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", - "owner": "feel-co", - "repo": "ndg", - "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", - "type": "github" - }, - "original": { - "owner": "feel-co", - "ref": "v2.6.0", - "repo": "ndg", - "type": "github" - } - }, "nekoflake": { "inputs": { "nixpkgs": "nixpkgs_11" @@ -1788,49 +1625,6 @@ "type": "github" } }, - "nix-bwrapper": { - "inputs": { - "nixpkgs": "nixpkgs_12", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1770308099, - "narHash": "sha256-VxuIePns4c+qpsHpLXW0CwovpKUx1xnvVIUuJwPO6fQ=", - "owner": "Naxdy", - "repo": "nix-bwrapper", - "rev": "1248b52f2bd4fe5690c1a36836a1798be21d953b", - "type": "github" - }, - "original": { - "owner": "Naxdy", - "repo": "nix-bwrapper", - "type": "github" - } - }, - "nix-cachyos-kernel": { - "inputs": { - "cachyos-kernel": "cachyos-kernel", - "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_8", - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_15" - }, - "locked": { - "lastModified": 1770535232, - "narHash": "sha256-hTJEqkAynKtjhGgty0ooDhMNvWxG9Dhdwdfz6EgO3Lw=", - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", - "rev": "76f7c893e4ce83d3b488dcb512ba374b11e7197b", - "type": "github" - }, - "original": { - "owner": "xddxdd", - "ref": "release", - "repo": "nix-cachyos-kernel", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -1953,27 +1747,6 @@ "type": "github" } }, - "nix-mineral": { - "inputs": { - "flake-compat": "flake-compat_9", - "flake-parts": "flake-parts_8", - "ndg": "ndg", - "nixpkgs": "nixpkgs_17" - }, - "locked": { - "lastModified": 1770151228, - "narHash": "sha256-4uB6s3xUYcWSTOr+thVPj42hcwS7PtW62my0rn8ZYyg=", - "owner": "cynicsketch", - "repo": "nix-mineral", - "rev": "fa4709e0700f990d46ac3136180ff1641de376f8", - "type": "github" - }, - "original": { - "owner": "cynicsketch", - "repo": "nix-mineral", - "type": "github" - } - }, "nix-on-droid": { "inputs": { "home-manager": [ @@ -2040,12 +1813,12 @@ "nixos-anywhere": { "inputs": { "disko": "disko_2", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_7", "nix-vm-test": "nix-vm-test", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", - "nixpkgs": "nixpkgs_18", - "treefmt-nix": "treefmt-nix_3" + "nixpkgs": "nixpkgs_12", + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1766503044, @@ -2063,9 +1836,9 @@ }, "nixos-cli": { "inputs": { - "flake-compat": "flake-compat_10", - "flake-parts": "flake-parts_10", - "nixpkgs": "nixpkgs_19", + "flake-compat": "flake-compat_8", + "flake-parts": "flake-parts_8", + "nixpkgs": "nixpkgs_13", "optnix": "optnix" }, "locked": { @@ -2146,8 +1919,8 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_12", - "nixpkgs": "nixpkgs_21" + "flake-compat": "flake-compat_10", + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1765841014, @@ -2258,36 +2031,6 @@ } }, "nixpkgs-lib_4": { - "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_5": { - "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_6": { "locked": { "lastModified": 1761765539, "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", @@ -2350,102 +2093,6 @@ } }, "nixpkgs_12": { - "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1770441824, - "narHash": "sha256-9iicOOWBXLKD6Yyph7w3+chmRZHJu2bJInh+PZEPu3o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "06b4256d6169bdc528ca347f1b14044c4e6c4e86", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_17": { - "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_18": { "locked": { "lastModified": 1749201760, "narHash": "sha256-LEZbj+VD/AR/dWL5ns1gMwzMvp4mLlv4WalxmZTKy5Y=", @@ -2461,7 +2108,7 @@ "type": "github" } }, - "nixpkgs_19": { + "nixpkgs_13": { "locked": { "lastModified": 1764527385, "narHash": "sha256-nA5ywiGKl76atrbdZ5Aucd8SjF/v8ew9b9QsC+MKL14=", @@ -2477,6 +2124,102 @@ "type": "github" } }, + "nixpkgs_14": { + "locked": { + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "locked": { + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1766651565, @@ -2494,102 +2237,6 @@ } }, "nixpkgs_20": { - "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_21": { - "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_22": { - "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_23": { - "locked": { - "lastModified": 1766840161, - "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_24": { - "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_25": { - "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_26": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -2798,30 +2445,10 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": "nixpkgs_13" - }, - "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "optnix": { "inputs": { - "flake-compat": "flake-compat_11", - "nixpkgs": "nixpkgs_20" + "flake-compat": "flake-compat_9", + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1765418479, @@ -2951,25 +2578,22 @@ "hyprland": "hyprland", "lanzaboote": "lanzaboote", "nekoflake": "nekoflake", - "nix-bwrapper": "nix-bwrapper", - "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nix-index-database": "nix-index-database", - "nix-mineral": "nix-mineral", "nix-on-droid": "nix-on-droid", "nixos-anywhere": "nixos-anywhere", "nixos-cli": "nixos-cli", "nixos-generators": "nixos-generators", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_16", "noctalia": "noctalia", "quickshell": "quickshell", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", "system-manager": "system-manager", - "treefmt-nix": "treefmt-nix_4", + "treefmt-nix": "treefmt-nix_3", "vscserver": "vscserver" } }, @@ -3054,7 +2678,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_17" }, "locked": { "lastModified": 1766894905, @@ -3075,7 +2699,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1766897356, @@ -3098,11 +2722,11 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_9", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_18", "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -3248,21 +2872,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -3366,24 +2975,6 @@ } }, "treefmt-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_14" - }, - "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixos-anywhere", @@ -3404,9 +2995,9 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_3": { "inputs": { - "nixpkgs": "nixpkgs_25" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1766000401, @@ -3442,8 +3033,8 @@ }, "vscserver": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_26" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1753541826, diff --git a/flake.nix b/flake.nix index 4df3072..0ec409b 100644 --- a/flake.nix +++ b/flake.nix @@ -161,13 +161,6 @@ repo = "nekoflake"; }; - nix-bwrapper = { - flake = true; - type = "github"; - owner = "Naxdy"; - repo = "nix-bwrapper"; - }; - nix-darwin = { flake = true; type = "github"; @@ -181,21 +174,6 @@ }; }; - nix-cachyos-kernel = { - flake = true; - type = "github"; - owner = "xddxdd"; - repo = "nix-cachyos-kernel"; - ref = "release"; - }; - - nix-mineral = { - flake = true; - type = "github"; - owner = "cynicsketch"; - repo = "nix-mineral"; - }; - nix-homebrew = { flake = true; type = "github"; @@ -416,10 +394,8 @@ }; # nixos hosts - - # my PC nixosConfigurations = { - "ada" = inputs.nixpkgs.lib.nixosSystem { + "s0mePC-nix" = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit @@ -429,8 +405,7 @@ }; modules = [ - "${self}/ada/" - inputs.agenix.nixosModules.default + "${self}/s0mePC-nix/" inputs.chaotic.nixosModules.default inputs.stylix.nixosModules.stylix inputs.sops-nix.nixosModules.sops @@ -438,13 +413,10 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.default inputs.nix-index-database.nixosModules.nix-index - inputs.nix-bwrapper.nixosModules.default - inputs.nix-mineral.nixosModules.nix-mineral ]; }; - # my laptop - "isla" = inputs.nixpkgs.lib.nixosSystem { + "s0melapt0p-nix" = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit @@ -454,8 +426,7 @@ }; modules = [ - "${self}/isla/" - inputs.agenix.nixosModules.default + "${self}/s0melapt0p-nix/" inputs.chaotic.nixosModules.default inputs.stylix.nixosModules.stylix inputs.sops-nix.nixosModules.sops @@ -463,15 +434,10 @@ inputs.home-manager.nixosModules.home-manager inputs.lanzaboote.nixosModules.lanzaboote inputs.nix-index-database.nixosModules.nix-index - inputs.nix-bwrapper.nixosModules.default - inputs.nix-mineral.nixosModules.nix-mineral ]; }; - # my VPSes: - - # VPS 1 - "hazel" = inputs.nixpkgs.lib.nixosSystem { + "s0mev1rtn0de-nix" = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit @@ -481,22 +447,15 @@ }; modules = [ - { - networking.hostName = inputs.nixpkgs.lib.mkDefault "hazel"; - } - - "${self}/kyra/" - inputs.agenix.nixosModules.default + "${self}/s0mev1rtn0de-nix/" inputs.disko.nixosModules.disko inputs.home-manager.nixosModules.default inputs.sops-nix.nixosModules.sops inputs.nix-index-database.nixosModules.nix-index - inputs.nix-mineral.nixosModules.nix-mineral ]; }; - # VPS 2 - "lynn" = inputs.nixpkgs.lib.nixosSystem { + "s0meMiniPC-nix" = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit @@ -506,83 +465,7 @@ }; modules = [ - { - networking.hostName = inputs.nixpkgs.lib.mkDefault "lynn"; - } - - "${self}/kyra/" - inputs.agenix.nixosModules.default - inputs.disko.nixosModules.disko - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - inputs.nix-index-database.nixosModules.nix-index - inputs.nix-mineral.nixosModules.nix-mineral - ]; - }; - - # VPS 3 - "ivy" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - { - networking.hostName = inputs.nixpkgs.lib.mkDefault "ivy"; - } - - "${self}/kyra/" - inputs.agenix.nixosModules.default - inputs.disko.nixosModules.disko - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - inputs.nix-index-database.nixosModules.nix-index - inputs.nix-mineral.nixosModules.nix-mineral - ]; - }; - - # VPS 4 - "mel" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - { - networking.hostName = inputs.nixpkgs.lib.mkDefault "mel"; - } - - "${self}/kyra/" - inputs.agenix.nixosModules.default - inputs.disko.nixosModules.disko - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - inputs.nix-index-database.nixosModules.nix-index - inputs.nix-mineral.nixosModules.nix-mineral - ]; - }; - - # homelab - "viola" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; - }; - - modules = [ - "${self}/viola" - inputs.agenix.nixosModules.default + "${self}/s0meMiniPC-nix" inputs.chaotic.nixosModules.default inputs.stylix.nixosModules.stylix inputs.sops-nix.nixosModules.sops @@ -590,31 +473,42 @@ inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.default inputs.nix-index-database.nixosModules.nix-index - inputs.nix-mineral.nixosModules.nix-mineral ]; }; + }; - # WSL2 - "wanda" = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { - inherit - inputs - self - ; + # deploy-rs + deploy = { + user = "hand7s"; + interactiveSudo = true; + autoRollback = true; + magicRollback = true; + remoteBuild = false; + sshOpts = [ + "-p" + "6969" + ]; + + nodes = { + "s0mev1rtn0de-nix" = { + hostname = "100.109.213.170"; + profiles = { + main = { + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix; + profilePath = "/nix/var/nix/profiles/system"; + }; + }; }; - modules = [ - "${self}/wanda/" - inputs.agenix.nixosModules.default - inputs.nixos-wsl.nixosModules.default - inputs.stylix.nixosModules.stylix - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - inputs.nix-index-database.nixosModules.nix-index - inputs.nix-bwrapper.nixosModules.default - inputs.nix-mineral.nixosModules.nix-mineral - ]; + "s0meMiniPC-nix" = { + hostname = "100.109.71.194"; + profiles = { + main = { + path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.s0mev1rtn0de-nix; + profilePath = "/nix/var/nix/profiles/system"; + }; + }; + }; }; }; }; diff --git a/hand7s/default.nix b/hand7s/default.nix index c94158c..e72a53c 100644 --- a/hand7s/default.nix +++ b/hand7s/default.nix @@ -4,6 +4,8 @@ "${self}/hand7s/options/gui.nix" "${self}/hand7s/wayland/hyprland.nix" + "${self}/hand7s/wayland/river.nix" + "${self}/hand7s/wayland/sway.nix" "${self}/hand7s/home/defaults.nix" "${self}/hand7s/home/gui.nix" @@ -15,7 +17,7 @@ "${self}/hand7s/nixpkgs/overlays.nix" "${self}/hand7s/services/hypridle.nix" - "${self}/hand7s/services/hyprsunset.nix" + "${self}/hand7s/services/swayidle.nix" "${self}/hand7s/services/kdeconnect.nix" "${self}/hand7s/systemd/hyprpolkitagent-service.nix" @@ -31,15 +33,19 @@ "${self}/hand7s/programs/index.nix" "${self}/hand7s/programs/obs-studio.nix" "${self}/hand7s/programs/starship.nix" + "${self}/hand7s/programs/firefox.nix" + "${self}/hand7s/programs/swaylock.nix" "${self}/hand7s/programs/yazi.nix" "${self}/hand7s/programs/zoxide.nix" "${self}/hand7s/programs/chrome.nix" "${self}/hand7s/programs/hyprlock.nix" + "${self}/hand7s/programs/hyprpanel.nix" "${self}/hand7s/programs/spicetify.nix" "${self}/hand7s/programs/vscode.nix" "${self}/hand7s/programs/zellij.nix" + "${self}/hand7s/programs/zed-editor.nix" "${self}/hand7s/programs/direnv.nix" + "${self}/hand7s/programs/kitty.nix" "${self}/hand7s/programs/noctalia.nix" - "${self}/hand7s/programs/iamb.nix" ]; } diff --git a/hand7s/fonts/fonts.nix b/hand7s/fonts/fonts.nix index ce4efc9..f02660a 100644 --- a/hand7s/fonts/fonts.nix +++ b/hand7s/fonts/fonts.nix @@ -1,4 +1,4 @@ -_: { +{...}: { fonts = { fontconfig = { enable = true; diff --git a/hand7s/gtk/gtk.nix b/hand7s/gtk/gtk.nix index 95d197c..8ddb6c4 100644 --- a/hand7s/gtk/gtk.nix +++ b/hand7s/gtk/gtk.nix @@ -1,4 +1,4 @@ -_: { +{...}: { gtk = { enable = true; }; diff --git a/hand7s/home/defaults.nix b/hand7s/home/defaults.nix index d423c84..63fe9e9 100644 --- a/hand7s/home/defaults.nix +++ b/hand7s/home/defaults.nix @@ -1,4 +1,4 @@ -_: { +{...}: { home = { stateVersion = "24.11"; username = "hand7s"; diff --git a/hand7s/home/gui.nix b/hand7s/home/gui.nix index de692fb..611056d 100644 --- a/hand7s/home/gui.nix +++ b/hand7s/home/gui.nix @@ -1,6 +1,5 @@ { osConfig, - config, lib, ... }: { @@ -8,13 +7,27 @@ gui = { enable = lib.mkIf ( - osConfig.networking.hostName == "ada" || osConfig.networking.hostName == "isla" || osConfig.networking.hostName == "wanda" + osConfig.networking.hostName == "s0mePC-nix" || osConfig.networking.hostName == "s0melapt0p-nix" ) true; sessionType = - lib.mkIf config.home.gui.enable - "Hyprland"; + if + ( + osConfig.networking.hostName == "s0mePC-nix" + ) + then "Hyprland" + else if + ( + osConfig.networking.hostName == "s0mew0rkstat1on-nix" + ) + then "Hyprland" + else if + ( + osConfig.networking.hostName == "s0melapt0p-nix" + ) + then "Sway" + else "None"; }; }; } diff --git a/hand7s/home/keyboard.nix b/hand7s/home/keyboard.nix index a712895..25887b5 100644 --- a/hand7s/home/keyboard.nix +++ b/hand7s/home/keyboard.nix @@ -1,4 +1,4 @@ -_: { +{...}: { home = { keyboard = { variant = ""; diff --git a/hand7s/home/packages.nix b/hand7s/home/packages.nix index 9ccc0ea..99ef80d 100644 --- a/hand7s/home/packages.nix +++ b/hand7s/home/packages.nix @@ -1,32 +1,62 @@ -{pkgs, ...}: { +{ + osConfig, + pkgs, + lib, + ... +}: { home = { - packages = with pkgs; [ - fd - gh - sd - xh - dua - nvd - dust - sops - rsync - procs - sbctl - gping - comma - trippy - bottom - ragenix - ripgrep - kubectl - gitoxide - deploy-rs - btop-rocm - bubblewrap - ripgrep-all - nixos-anywhere - wireguard-tools - nix-output-monitor - ]; + packages = with pkgs; + [ + fd + gh + sd + xh + dua + nvd + gat + dust + sops + rsync + procs + sbctl + gping + dconf + tokei + comma + ifuse + trippy + bottom + kubectl + yt-dlp + ripgrep + gitoxide + tty-clock + deploy-rs + monero-cli + nixos-anywhere + wireguard-tools + yubico-piv-tool + yubikey-manager + libimobiledevice + nix-output-monitor + yubikey-touch-detector + yubikey-personalization + netbird-ui + ] + ++ lib.optionals ( + osConfig.networking.hostName == "s0mePC-nix" + ) [ + mindustry + thunderbird + tetrio-desktop + min-ed-launcher + qbittorrent-enhanced + ] + ++ lib.optionals ( + osConfig.networking.hostName == "s0melapt0p-nix" + ) [ + iwgtk + brightnessctl + ]; }; } diff --git a/hand7s/nix/settings/substituters.nix b/hand7s/nix/settings/substituters.nix index da0035f..4cc1aa4 100644 --- a/hand7s/nix/settings/substituters.nix +++ b/hand7s/nix/settings/substituters.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { substituters = [ @@ -9,10 +9,9 @@ _: { # cachix "https://nix-community.cachix.org/" "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" "https://hyprland.cachix.org" "https://chaotic-nyx.cachix.org/" - # nix-community - "https://hydra.nix-community.org/" ]; }; }; diff --git a/hand7s/nix/settings/trusted-public-keys.nix b/hand7s/nix/settings/trusted-public-keys.nix index e5cc01b..62cbbde 100644 --- a/hand7s/nix/settings/trusted-public-keys.nix +++ b/hand7s/nix/settings/trusted-public-keys.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-public-keys = [ diff --git a/hand7s/nixpkgs/config.nix b/hand7s/nixpkgs/config.nix index 13ed34c..0425353 100644 --- a/hand7s/nixpkgs/config.nix +++ b/hand7s/nixpkgs/config.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { config = { allowBroken = true; diff --git a/hand7s/nixpkgs/overlays.nix b/hand7s/nixpkgs/overlays.nix index 8db0844..2881eba 100644 --- a/hand7s/nixpkgs/overlays.nix +++ b/hand7s/nixpkgs/overlays.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { overlays = [ ]; diff --git a/hand7s/options/gui.nix b/hand7s/options/gui.nix index ee67884..5f8fc37 100644 --- a/hand7s/options/gui.nix +++ b/hand7s/options/gui.nix @@ -2,12 +2,12 @@ lib, pkgs, config, - self, + inputs, ... }: let cfg = config.home.gui; - ayugram = self.inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop; - freesm-launcher = self.inputs.freesm.packages.${pkgs.system}.freesmlauncher; + ayugram = inputs.ayugram-desktop.packages.${pkgs.system}.ayugram-desktop; + freesm-launcher = inputs.freesm.packages.${pkgs.system}.freesmlauncher; in { options.home.gui = { enable = lib.mkEnableOption '' @@ -19,7 +19,6 @@ in { ''; sessionType = lib.mkOption { - default = "None"; type = lib.types.enum [ "DWL" "Sway" @@ -27,7 +26,7 @@ in { "Hyprland" "None" ]; - + default = "None"; description = '' This option allows to choose current desktop session. All three: riverwm, sway and Hyprland has their own config. Almost @@ -40,55 +39,49 @@ in { home = { packages = with pkgs; [ - throne - heroic vesktop - ayugram + nekoray anki-bin obsidian - mindustry - lan-mouse + playerctl monero-gui + mindustry + bitwarden + lan-mouse parsec-bin - proton-pass pwvucontrol easyeffects - thunderbird - chatterino7 - tetrio-desktop + ayugram + element-desktop hyprpolkitagent freesm-launcher - bitwarden-desktop - qbittorrent-enhanced (discord.override { withVencord = true; withOpenASAR = false; }) ] + ++ lib.optionals ( + cfg.sessionType == "Sway" + ) [ + swaykbdd + autotiling-rs + sway-audio-idle-inhibit + sway-contrib.grimshot + sway-contrib.inactive-windows-transparency + ] + ++ lib.optionals ( + cfg.sessionType == "River" + ) [ + wayshot + waylock + wayidle + ] ++ lib.optionals ( cfg.sessionType == "Hyprland" ) [ - fum - timg - dconf - iwgtk - tokei - ifuse - yt-dlp - termusic - playerctl - tty-clock + inputs.noctalia.packages.${system}.default grimblast - monero-cli - brightnessctl - hyprsysteminfo - yubico-piv-tool - yubikey-manager - libimobiledevice - yubikey-touch-detector - yubikey-personalization - self.inputs.noctalia.packages.${system}.default ]; }; @@ -96,8 +89,10 @@ in { chromium.enable = true; spicetify.enable = true; vscode.enable = true; + fuzzel.enable = true; ghostty.enable = true; - git.enable = true; + firefox.enable = true; + alacritty.enable = true; }; services = with lib.mkDefault; { diff --git a/hand7s/programs/direnv.nix b/hand7s/programs/direnv.nix index 84af0d8..973693c 100644 --- a/hand7s/programs/direnv.nix +++ b/hand7s/programs/direnv.nix @@ -1,9 +1,7 @@ -_: { +{...}: { programs = { direnv = { enable = true; - silent = true; - nix-direnv = { enable = true; }; diff --git a/hand7s/programs/eza.nix b/hand7s/programs/eza.nix index 2ac0ee4..21fe51b 100644 --- a/hand7s/programs/eza.nix +++ b/hand7s/programs/eza.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { eza = { enable = true; diff --git a/hand7s/programs/firefox.nix b/hand7s/programs/firefox.nix new file mode 100644 index 0000000..a2a2aca --- /dev/null +++ b/hand7s/programs/firefox.nix @@ -0,0 +1,28 @@ +{ + inputs, + pkgs, + ... +}: let + zen-browser = inputs.zen-browser.packages.${pkgs.system}.default; +in { + programs = { + firefox = { + package = zen-browser; + profiles = rec { + default = { + userContent = " + --zen-colors-primary: #82aaff !important; + --zen-colors-secondary: #c099ff !important; + --zen-colors-tertiary: #1e2030 !important; + --zen-colors-border: #3b4261 !important; + --zen-dialog-background: #222436 !important; + + .tab-background[selected=[selected=''] { + background-color: #6c598c !important; + } + "; + }; + }; + }; + }; +} diff --git a/hand7s/programs/fzf.nix b/hand7s/programs/fzf.nix index 31960f5..47bc89b 100644 --- a/hand7s/programs/fzf.nix +++ b/hand7s/programs/fzf.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { fzf = { enable = true; diff --git a/hand7s/programs/ghostty.nix b/hand7s/programs/ghostty.nix index c1e2e65..28ed2f7 100644 --- a/hand7s/programs/ghostty.nix +++ b/hand7s/programs/ghostty.nix @@ -8,25 +8,12 @@ enableFishIntegration = true; installBatSyntax = true; settings = { - title = ""; + title = "spooky scary tty"; - bell-features = "system"; - - command = "${lib.getExe pkgs.fish}"; + command = "${lib.getExe pkgs.fish} --login --interactive"; confirm-close-surface = false; - cursor-style-blink = true; - cursor-style = "bar"; - - mouse-hide-while-typing = true; - - working-directory = "home"; - - window-save-state = "never"; - - window-inherit-working-directory = false; - keybind = [ "ctrl+shift+d=new_split:right" "ctrl+shift+a=new_split:down" diff --git a/hand7s/programs/git.nix b/hand7s/programs/git.nix index e3e9b49..459f49f 100644 --- a/hand7s/programs/git.nix +++ b/hand7s/programs/git.nix @@ -5,18 +5,23 @@ }: { programs = { git = { + enable = true; package = pkgs.git; - settings = { - user = { - email = "git+me@hand7s.org"; - name = "s0me1newithhand7s"; - }; + userEmail = "117505144+s0me1newithhand7s@users.noreply.github.com"; + userName = "s0me1newithhand7s"; + aliases = { + pushall = "push github && push gitlab"; + pushall-f = "push --force github && push --force gitlab"; + }; - signing = { - format = "ssh"; - signByDefault = true; - key = osConfig.sops.secrets.sshKey.path; - }; + signing = { + format = "ssh"; + signByDefault = true; + key = osConfig.sops.secrets.sshKey.path; + }; + + lfs = { + enable = true; }; }; }; diff --git a/hand7s/programs/helix.nix b/hand7s/programs/helix.nix index c8ae19c..65b6973 100644 --- a/hand7s/programs/helix.nix +++ b/hand7s/programs/helix.nix @@ -5,7 +5,7 @@ }: { programs = { helix = { - package = pkgs.helix; + package = pkgs.helix_git; enable = true; defaultEditor = true; extraPackages = with pkgs; [ diff --git a/hand7s/programs/hyprlock.nix b/hand7s/programs/hyprlock.nix index 992a71f..64952a1 100644 --- a/hand7s/programs/hyprlock.nix +++ b/hand7s/programs/hyprlock.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: { @@ -21,17 +20,14 @@ label = [ { monitor = ""; - text = '' - cmd[update:1000] ${lib.getExe' pkgs.uutils-coreutils-noprefix "date"} +"%T" - ''; - + text = "$TIME"; text_align = "center"; color = config.lib.stylix.colors.base01; font_size = 48; font_family = config.stylix.fonts.emoji.name; rotate = 0; - position = "0, 200"; + position = "0, 50"; halign = "center"; valign = "center"; @@ -43,17 +39,14 @@ { monitor = ""; - text = '' - cmd[update:1000] ${lib.getExe' pkgs.uutils-coreutils-noprefix "date"} +"%A, %B" - ''; - + text = "> $LAYOUT[en,ru]"; text_align = "center"; - color = config.lib.stylix.colors.base01; - font_size = 24; + color = config.lib.stylix.colors.base06; + font_size = 26; font_family = config.stylix.fonts.emoji.name; rotate = 0; - position = "0, 150"; + position = "200, -50"; halign = "center"; valign = "center"; @@ -80,7 +73,7 @@ hide_input = false; rounding = -0.3; - fail_text = "$FAIL -> $ATTEMPTS"; + fail_text = "$FAIL ($ATTEMPTS)"; fail_transition = 1000; capslock_color = -1; numlock_color = -1; @@ -88,7 +81,7 @@ invert_numlock = false; swap_font_color = false; - position = "0, -650"; + position = "0, -50"; halign = "center"; valign = "center"; diff --git a/hand7s/programs/hyprpanel.nix b/hand7s/programs/hyprpanel.nix new file mode 100644 index 0000000..4d8e995 --- /dev/null +++ b/hand7s/programs/hyprpanel.nix @@ -0,0 +1,440 @@ +{ + pkgs, + lib, + ... +}: { + programs = { + hyprpanel = { + enable = false; + + settings = { + layout = { + "bar.layouts" = { + "*" = { + left = [ + "dashboard" + "workspaces" + "media" + ]; + + middle = [ + "clock" + "power" + ]; + + right = [ + "network" + "kbinput" + "volume" + "systray" + "notifications" + ]; + }; + }; + }; + + scalingPriority = "hyprland"; + + tear = false; + dummy = true; + + hyprpanel = { + restartAgs = true; + restartCommand = "${lib.getExe' pkgs.systemd "systemctl"} --user restart hyprpanel.service"; + }; + + bar = { + autoHide = "never"; + scrollSpeed = 5; + + battery = { + hideLabelWhenFull = true; + label = true; + }; + + bluetooth = { + label = true; + }; + + clock = { + format = "%a, %b %d %I:%M:%S %p"; + icon = "󰸗"; + showIcon = true; + showTime = true; + }; + + launcher = { + icon = " "; + autoDetectIcon = true; + }; + + media = { + format = "{artist: - }{title}"; + show_active_only = true; + show_label = true; + truncation = true; + truncation_size = 30; + }; + + network = { + label = true; + showWifiInfo = true; + truncation = true; + truncation_size = 10; + }; + + notifications = { + show_total = false; + hideCountWhenZero = true; + }; + + volume = { + label = true; + scrollDown = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; + scrollUp = "${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + rightClick = "${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; + }; + + windowtitle = { + icon = true; + label = true; + class_name = false; + custom_title = true; + truncation = true; + truncation_size = 50; + }; + + workspaces = { + show_icons = false; + show_numbered = false; + showApplicationIcons = true; + showAllActive = true; + showWsIcons = true; + numbered_active_indicator = "highlight"; + workspaces = 20; + monitorSpecific = true; + reverse_scroll = false; + scroll_speed = 5; + spacing = 1.0; + workspaceMask = true; + ignored = ""; + + applicationIconEmptyWorkspace = ""; + applicationIconFallback = "󰣆"; + + icons = { + active = ""; + available = ""; + occupied = ""; + }; + }; + + customModules = { + scrollSpeed = 5; + + cava = { + showIcon = true; + icon = ""; + spaceCharacter = " "; + showActiveOnly = true; + stereo = false; + autoSensitivity = true; + + bars = 10; + channels = 2; + framerate = 165; + samplerate = 48000; + lowCutoff = 20; + highCutoff = 20000; + + barCharacters = [ + "▁" + "▂" + "▃" + "▄" + "▅" + "▆" + "▇" + "█" + ]; + }; + + cpu = { + icon = ""; + label = true; + round = true; + pollingInterval = 1000; + }; + + cpuTemp = { + icon = ""; + label = true; + pollingInterval = 500; + round = true; + showUnit = true; + sensor = ""; + }; + + hypridle = { + label = true; + pollingInterval = 500; + + offIcon = ""; + offLabel = "OFF"; + onIcon = ""; + onLabel = "ON"; + }; + + hyprsunset = { + label = true; + pollingInterval = 500; + + offIcon = "󰛨"; + offLabel = "OFF"; + onIcon = "󱩌"; + onLabel = "ON"; + }; + + kbLayout = { + icon = "󰌌"; + label = true; + labelType = "code"; + rightClick = "${lib.getExe' pkgs.hyprland "hyprctl"} switchxkblayout monsgeek-monsgeek-keyboard next"; + }; + + netstat = { + icon = "󰖟"; + label = true; + pollingInterval = 250; + dynamicIcon = true; + round = true; + + rateUnit = "auto"; + networkInLabel = "↓"; + networkOutLabel = "↑"; + }; + + power = { + icon = ""; + showLabel = true; + leftClick = "menu:powerdropdown"; + }; + + microphone = { + label = true; + mutedIcon = ""; + unmutedIcon = ""; + + leftClick = "menu:audio"; + }; + + ram = { + icon = ""; + label = true; + labelType = "percentage"; + pollingInterval = 250; + round = true; + }; + + storage = { + icon = "󰋊"; + label = true; + labelType = "percentage"; + pollingInterval = 2000; + round = false; + }; + + submap = { + label = true; + showSubmapName = true; + enabledIcon = "󰌐"; + enabledText = "ON"; + disabledIcon = "󰌌"; + disabledText = "OFF"; + }; + + updates = { + label = true; + autoHide = true; + padZero = true; + pollingInterval = 1440000; + updateCommand = "nix flake update --flake ~/Projects/flake"; + + icon = { + pending = "󰏗"; + updated = "󰏖"; + }; + }; + + weather = { + label = true; + unit = "metric"; + }; + }; + }; + + menus = { + transition = "crossfade"; + transitionTime = 200; + + clock = { + time = { + military = false; + hideSeconds = true; + }; + + weather = { + enabled = true; + location = "Yelabuga"; + unit = "metric"; + key = "ac3df6535cac4448a4c83337252702"; + }; + }; + + dashboard = { + shortcuts = { + left = { + shortcut1 = { + command = "${lib.getExe pkgs.google-chrome}"; + icon = ""; + tooltip = "Google Chrome"; + }; + + shortcut2 = { + command = "spotify"; + icon = ""; + tooltip = "Spotify"; + }; + + shortcut3 = { + command = "${lib.getExe pkgs.discord}"; + icon = ""; + tooltip = "Discord"; + }; + + shortcut4 = { + command = "ayugram-desktop"; + icon = ""; + tooltip = "Telegram"; + }; + }; + + right = { + shortcut1 = { + command = "${lib.getExe pkgs.fuzzel}"; + icon = ""; + tooltip = "Search"; + }; + + shortcut3 = { + command = "${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; + icon = "󰄀"; + tooltip = "Screenshot"; + }; + }; + }; + + stats = { + enable_gpu = false; + enabled = true; + interval = 1000; + }; + + directories = { + enabled = true; + }; + + powermenu = { + avatar = { + image = "/home/hand7s/Pictures/pfp4_mini.jpg"; + name = "system"; + }; + }; + }; + + media = { + displayTime = true; + displayTimeTooltip = true; + noMediaText = "-"; + hideAlbum = false; + hideAuthor = false; + }; + + power = { + confirmation = true; + showLabel = true; + logout = "${lib.getExe' pkgs.hyprland "hyprctl"} dispatch exit"; + reboot = "${lib.getExe' pkgs.systemd "systemctl"} reboot"; + shutdown = "${lib.getExe' pkgs.systemd "systemctl"} poweroff"; + sleep = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; + }; + + volume = { + raiseMaximumVolume = false; + }; + }; + + notifications = { + active_monitor = true; + cache_actions = true; + clearDelay = 50; + displayedTotal = 5; + showActionsOnHover = true; + timeout = 5000; + }; + + theme = { + matugen = false; + + name = "tokyo-night-vivid"; + + font = { + name = "Hack Font Nerd Regular"; + size = "16px"; + weight = 600; + }; + + bar = { + transparent = false; + floating = true; + layer = "top"; + location = "top"; + + margin_bottom = "0"; + margin_sides = "20px"; + margin_top = "20px"; + + border_radius = "10px"; + + border = { + location = "full"; + width = "2px"; + }; + + buttons = { + enableBorders = false; + monochrome = false; + style = "default"; + }; + }; + + osd = { + enable = true; + active_monitor = true; + duration = 2500; + location = "right"; + margins = "5px 5px 5px 5px"; + muted_zero = false; + radius = "10px"; + }; + }; + + wallpaper = { + enable = false; + pywal = false; + image = ""; + }; + }; + }; + }; +} diff --git a/hand7s/programs/iamb.nix b/hand7s/programs/iamb.nix deleted file mode 100644 index 268faf0..0000000 --- a/hand7s/programs/iamb.nix +++ /dev/null @@ -1,16 +0,0 @@ -_: { - programs = { - iamb = { - enable = true; - settings = { - default_profile = "hand7s"; - profiles = { - hand7s = { - user_id = "@s0me1newithhand7s:ubiquelambda.dev"; - url = "https://ubiquelambda.dev"; - }; - }; - }; - }; - }; -} diff --git a/hand7s/programs/index.nix b/hand7s/programs/index.nix index d7475b9..a3c61a7 100644 --- a/hand7s/programs/index.nix +++ b/hand7s/programs/index.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { nix-index = { enable = true; diff --git a/hand7s/programs/kitty.nix b/hand7s/programs/kitty.nix new file mode 100644 index 0000000..6c3c04b --- /dev/null +++ b/hand7s/programs/kitty.nix @@ -0,0 +1,12 @@ +{...}: { + programs = { + kitty = { + enable = true; + enableGitIntegration = true; + + shellIntegration = { + enableFishIntegration = true; + }; + }; + }; +} diff --git a/hand7s/programs/mangohud.nix b/hand7s/programs/mangohud.nix index df305f7..820c2db 100644 --- a/hand7s/programs/mangohud.nix +++ b/hand7s/programs/mangohud.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { mangohud = { enable = true; diff --git a/hand7s/programs/mpv.nix b/hand7s/programs/mpv.nix index f8aa847..6c75a39 100644 --- a/hand7s/programs/mpv.nix +++ b/hand7s/programs/mpv.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { mpv = { enable = true; diff --git a/hand7s/programs/noctalia.nix b/hand7s/programs/noctalia.nix index 662f6cc..b425b99 100644 --- a/hand7s/programs/noctalia.nix +++ b/hand7s/programs/noctalia.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: { +{config, ...}: { programs = if ( @@ -18,14 +14,12 @@ dimDesktop = false; forceBlackScreenCorners = true; showScreenCorners = true; - screenRadiusRatio = 1; + screenRadiusRatio = 2; radiusRatio = 0.7; - enableShadows = true; - shadowDirection = "center"; }; appLauncher = { - position = "bottom_center"; + position = "center"; useApp2Unit = false; sortByMostUsed = true; enableClipboardHistory = false; @@ -40,8 +34,8 @@ }; bar = { - floating = false; - density = "default"; + floating = true; + density = "comfortable"; position = "right"; showCapsule = false; marginVertical = 1; @@ -53,7 +47,7 @@ widgets = { left = [ { - id = "ControlCenter"; + id = "SidePanelToggle"; useDistroLogo = true; } @@ -118,10 +112,6 @@ }; }; - notifications = { - location = "top_center"; - }; - controlCenter = { position = "close_to_bar_button"; quickSettingsStyle = "compact"; @@ -191,27 +181,23 @@ enabled = true; alwaysOnTop = true; autoHideMs = 2500; - location = "bottom_center"; + location = "top"; monitors = [ "DP-3" ]; }; ui = { - fontDefault = lib.mkForce "Nerd Fonts Hack"; + fontDefault = "Nerd Fonts Hack"; fontDefaultScale = 1; - fontFixed = lib.mkForce "Nerd Fonts Hack"; + fontFixed = "Nerd Fonts Hack"; fontFixedScale = 1; idleInhibitorEnabled = false; tooltipsEnabled = true; }; - wallpaper = { - enabled = false; - }; - location = { - name = "Tatarstan, Yelaguba"; + name = "Yelaguba"; showWeekNumberInCalendar = true; use12hourFormat = false; useFahrenheit = false; diff --git a/hand7s/programs/spicetify.nix b/hand7s/programs/spicetify.nix index 56ab174..4e59070 100644 --- a/hand7s/programs/spicetify.nix +++ b/hand7s/programs/spicetify.nix @@ -1,19 +1,19 @@ { lib, pkgs, - self, + inputs, ... }: { programs = { spicetify = { - enabledExtensions = with self.inputs.spicetify-nix.legacyPackages.${pkgs.system}.extensions; [ + enabledExtensions = with inputs.spicetify-nix.legacyPackages.${pkgs.system}.extensions; [ adblock hidePodcasts shuffle ]; - theme = lib.mkForce self.inputs.spicetify-nix.legacyPackages.${pkgs.system}.themes.text; - colorScheme = lib.mkForce "TokyoNight"; + theme = lib.mkForce inputs.spicetify-nix.legacyPackages.${pkgs.system}.themes.text; + colorScheme = lib.mkForce "Spotify"; }; }; } diff --git a/hand7s/programs/starship.nix b/hand7s/programs/starship.nix index 5228038..b89715f 100644 --- a/hand7s/programs/starship.nix +++ b/hand7s/programs/starship.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { starship = { enable = true; @@ -7,14 +7,15 @@ _: { add_newline = true; format = '' - [╭──╼](bold blue) $username at $hostname on $os + [╭──╼](bold blue) $hostname $os [┆](bold blue) $directory$git_branch$git_commit$git_state$git_metrics$git_status - [╰─>](bold blue) ''; + [╰─>](bold blue) + ''; right_format = ''$cmd_duration ($character) at ❗$time''; os = { - format = "[($name $codename$version$edition $symbol )]($style)"; + format = "on [($name $codename$version$edition $symbol )]($style)"; style = "bold blue"; disabled = false; }; @@ -26,13 +27,6 @@ _: { disabled = false; }; - username = { - show_always = true; - disabled = false; - format = "[$user]($style)"; - style_user = "bold green"; - }; - character = { success_symbol = "[✓](bold green)"; error_symbol = "[✗](bold red)"; diff --git a/hand7s/programs/swaylock.nix b/hand7s/programs/swaylock.nix new file mode 100644 index 0000000..8a2927d --- /dev/null +++ b/hand7s/programs/swaylock.nix @@ -0,0 +1,19 @@ +{ + config, + lib, + ... +}: { + programs = { + swaylock = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; + + settings = { + show-failed-attempts = true; + }; + }; + }; +} diff --git a/hand7s/programs/vscode.nix b/hand7s/programs/vscode.nix index c847eaa..f6cdb04 100644 --- a/hand7s/programs/vscode.nix +++ b/hand7s/programs/vscode.nix @@ -6,19 +6,14 @@ }: { programs = { vscode = { - package = pkgs.vscodium; profiles = { default = { extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide - ms-vscode-remote.vscode-remote-extensionpack ms-vsliveshare.vsliveshare - redhat.vscode-yaml redhat.ansible - - nefrob.vscode-just-syntax ]; userSettings = lib.mkForce { @@ -29,7 +24,7 @@ "editor.cursorSmoothCaretAnimation" = "on"; "editor.wordWrap" = "on"; - "workbench.colorTheme" = "Tokyo Storm AltSynt"; + "workbench.colorTheme" = "Tokyo Night Moon"; "workbench.sideBar.location" = "right"; "workbench.activityBar.location" = "top"; "workbench.editor.editorActionsLocation" = "titleBar"; @@ -40,6 +35,11 @@ "terminal.integrated.cursorBlinking" = true; "files.autoSave" = "afterDelay"; + + "[nix]" = { + "editor.insertSpaces" = true; + "editor.tabSize" = 4; + }; }; }; }; diff --git a/hand7s/programs/yazi.nix b/hand7s/programs/yazi.nix index 234c8e9..3cd61fe 100644 --- a/hand7s/programs/yazi.nix +++ b/hand7s/programs/yazi.nix @@ -50,14 +50,6 @@ } ]; - view = [ - { - run = "${lib.getExe pkgs.timg} ''-p k -C $@ | ${lib.getExe' pkgs.uutils-coreutils-noprefix "more"}''"; - block = true; - for = "unix"; - } - ]; - edit = [ { run = "${lib.getExe pkgs.helix} ''$@''"; @@ -69,36 +61,12 @@ open = [ { run = "${lib.getExe' pkgs.xdg-utils "xdg-open"} ''$@''"; - orphan = true; + block = true; for = "unix"; } ]; }; - open = { - rules = [ - { - mime = "image/*"; - use = "view"; - } - - { - mime = "text/*"; - use = "edit"; - } - - { - mime = "audio/*"; - use = "play"; - } - - { - mime = "video/*"; - use = "play"; - } - ]; - }; - input = { cursor_blink = true; }; diff --git a/hand7s/programs/zed-editor.nix b/hand7s/programs/zed-editor.nix new file mode 100644 index 0000000..c49e0e9 --- /dev/null +++ b/hand7s/programs/zed-editor.nix @@ -0,0 +1,32 @@ +{pkgs, ...}: { + programs = { + zed-editor = { + enable = false; + package = pkgs.zed-editor_git; + installRemoteServer = true; + userSettings = { + vim_mode = true; + features = { + copilot = false; + }; + + tab_bar = { + show = false; + }; + + telemetry = { + metrics = false; + }; + }; + + extensions = [ + "nix" + "xy-zed" + ]; + + extraPackages = [ + pkgs.nixd + ]; + }; + }; +} diff --git a/hand7s/programs/zoxide.nix b/hand7s/programs/zoxide.nix index 0739e21..5f82533 100644 --- a/hand7s/programs/zoxide.nix +++ b/hand7s/programs/zoxide.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { zoxide = { enable = true; diff --git a/hand7s/qt/qt.nix b/hand7s/qt/qt.nix index fab0fc5..b79437c 100644 --- a/hand7s/qt/qt.nix +++ b/hand7s/qt/qt.nix @@ -1,4 +1,4 @@ -_: { +{...}: { qt = { enable = true; }; diff --git a/hand7s/services/hyprsunset.nix b/hand7s/services/hyprsunset.nix deleted file mode 100644 index c289855..0000000 --- a/hand7s/services/hyprsunset.nix +++ /dev/null @@ -1,23 +0,0 @@ -_: { - services = { - hyprsunset = { - enable = true; - settings = { - max-gamma = 150; - - profile = [ - { - time = "6:00"; - identity = true; - } - - { - time = "22:00"; - temperature = 4000; - gamma = 1.1; - } - ]; - }; - }; - }; -} diff --git a/hand7s/services/swayidle.nix b/hand7s/services/swayidle.nix new file mode 100644 index 0000000..a6f9f94 --- /dev/null +++ b/hand7s/services/swayidle.nix @@ -0,0 +1,51 @@ +{ + config, + pkgs, + lib, + ... +}: { + services = { + swayidle = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; + + events = [ + { + event = "lock"; + command = "${lib.getExe pkgs.swaylock}"; + } + + { + event = "before-sleep"; + command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power off'"; + } + + { + event = "after-resume"; + command = "${lib.getExe' pkgs.sway "swaymsg"} 'output * power on'"; + } + ]; + + timeouts = [ + { + timeout = 300; + command = "${lib.getExe pkgs.brightnessctl} -s set 10"; + resumeCommand = "${lib.getExe pkgs.brightnessctl} -r"; + } + + { + timeout = 600; + command = "${lib.getExe pkgs.swaylock}"; + } + + { + timeout = 900; + command = "${lib.getExe' pkgs.systemd "systemctl"} suspend"; + } + ]; + }; + }; +} diff --git a/hand7s/stylix/base16Scheme.nix b/hand7s/stylix/base16Scheme.nix index 6cea17f..8edbd4d 100644 --- a/hand7s/stylix/base16Scheme.nix +++ b/hand7s/stylix/base16Scheme.nix @@ -1,4 +1,4 @@ -_: { +{...}: { stylix = { base16Scheme = { scheme = "Tokyonight by Folke Lemaitre (https://github.com/folke)"; diff --git a/hand7s/stylix/defaults.nix b/hand7s/stylix/defaults.nix index 143d1ea..30f65de 100644 --- a/hand7s/stylix/defaults.nix +++ b/hand7s/stylix/defaults.nix @@ -1,4 +1,4 @@ -_: { +{...}: { stylix = { enable = true; autoEnable = true; diff --git a/hand7s/stylix/image.nix b/hand7s/stylix/image.nix index 4f07c45..17a3c49 100644 --- a/hand7s/stylix/image.nix +++ b/hand7s/stylix/image.nix @@ -1,5 +1,5 @@ -_: { +{...}: { stylix = { - image = ./wallpaper3.png; + image = ./wallpaper3.jpg; }; } diff --git a/hand7s/stylix/red_ish.nix b/hand7s/stylix/red_ish.nix index 6c5ae1e..909ea6d 100644 --- a/hand7s/stylix/red_ish.nix +++ b/hand7s/stylix/red_ish.nix @@ -1,4 +1,4 @@ -_: { +{...}: { stylix = { base16Scheme = { base00 = "2a1617"; diff --git a/hand7s/stylix/wallpaper.jpg b/hand7s/stylix/wallpaper.jpg index 5f5fcad..e8c68c8 100644 Binary files a/hand7s/stylix/wallpaper.jpg and b/hand7s/stylix/wallpaper.jpg differ diff --git a/hand7s/stylix/wallpaper2.jpg b/hand7s/stylix/wallpaper2.jpg new file mode 100644 index 0000000..618018d Binary files /dev/null and b/hand7s/stylix/wallpaper2.jpg differ diff --git a/hand7s/stylix/wallpaper3.jpg b/hand7s/stylix/wallpaper3.jpg new file mode 100644 index 0000000..5f5fcad Binary files /dev/null and b/hand7s/stylix/wallpaper3.jpg differ diff --git a/hand7s/stylix/wallpaper3.png b/hand7s/stylix/wallpaper3.png deleted file mode 100644 index 97a0dae..0000000 Binary files a/hand7s/stylix/wallpaper3.png and /dev/null differ diff --git a/hand7s/wayland/hyprland.nix b/hand7s/wayland/hyprland.nix index 907ee9f..e9812fe 100644 --- a/hand7s/wayland/hyprland.nix +++ b/hand7s/wayland/hyprland.nix @@ -1,5 +1,5 @@ { - self, + inputs, config, pkgs, lib, @@ -14,8 +14,8 @@ ) true; - package = self.inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = self.inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; settings = { monitor = ", 2560x1440@165.00Hz, 0x0, 1"; @@ -92,7 +92,9 @@ "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service" "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service" "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service" - "${lib.getExe self.inputs.noctalia.packages.${pkgs.system}.default}" + + # "${lib.getExe' pkgs.systemd "systemctl"} --user start noctalis.service" + "${lib.getExe inputs.noctalia.packages.${pkgs.system}.default}" "${lib.getExe' pkgs.hyprland "hyprctl"} setcursor material_light_cursors 20" ]; @@ -100,12 +102,13 @@ bind = [ "ALT, return, exec, ${lib.getExe pkgs.ghostty}" "ALT, Q, killactive," - "ALT, S, exec, ${lib.getExe self.inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle" + "ALT, S, exec, ${lib.getExe inputs.noctalia.packages.${pkgs.system}.default} ipc call launcher toggle" "ALT, F, fullscreen, 0" "ALT, L, exec, ${lib.getExe pkgs.hyprlock}" + "ALT SHIFT, E, exit," "ALT SHIFT, space, togglefloating, active" - "ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png | , killall -9 hyprpicker" + "ALT SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png" "ALT, left, movefocus, l" "ALT, right, movefocus, r" @@ -136,8 +139,6 @@ "ALT SHIFT, 0, movetoworkspacesilent, 10" "ALT SHIFT, H, movetoworkspacesilent, special" - "ALT, Tab, hyprexpo:expo, toggle" - "ALT, mouse_down, workspace, e+1" "ALT, mouse_up, workspace, e-1" ]; @@ -165,16 +166,14 @@ animation = [ "enabled = true" - "animation = windows, 1, 7, popin" - "animation = windowsOut, 1, 7, popin" + "bezier = bez, 0.05, 0.9, 0.1, 1.05" - "animation = layers, 1, 7, fade" - - "animation = border, 1, 10" - "animation = borderangle, 1, 10" - - "animation = workspaces, 1, 7, slidevert" - "animation = specialWorkspace, 1, 7, slidevert" + "animation = windows, 1, 7, bez" + "animation = windowsOut, 1, 7, default, popin 80%" + "animation = border, 1, 10, default" + "animation = borderangle, 1, 10, default" + "animation = fade, 1, 7, default" + "animation = workspaces, 1, 7, default" ]; misc = { @@ -217,15 +216,10 @@ hyprscrolling = { fullscreen_on_one_column = true; follow_focus = true; - column_width = 0.7; - focus_fit_method = "center"; }; - hyprexpo = { - columns = 2; - gap_size = 10; - skip_empty = true; - workspace_method = "workspace"; + easymotion = { + only_special = false; }; dynamic-cursors = { @@ -234,7 +228,7 @@ threshold = 2; stretch = { limit = 4000; - function = "linear"; + function = "quadratic"; }; shake = { @@ -262,10 +256,17 @@ }; }; - plugins = with pkgs.hyprlandPlugins; [ - hypr-dynamic-cursors - hyprscrolling - hyprexpo + plugins = [ + # pkgs.hyprlandPlugins.hypr-dynamic-cursors + # pkgs.hyprlandPlugins.xtra-dispatchers + # pkgs.hyprlandPlugins.hyprwinwrap + # pkgs.hyprlandPlugins.hyprgrass + # pkgs.hyprlandPlugins.hyprscrolling + + # inputs.hyprcurs.packages.${pkgs.system}.hypr-dynamic-cursors + # inputs.hyprplugs.packages.${pkgs.system}.hyprscrolling + # inputs.hyprplugs.packages.${pkgs.system}.xtra-dispatchers + # inputs.hyprplugs.packages.${pkgs.system}.hyprwinwrap ]; }; }; diff --git a/hand7s/wayland/river.nix b/hand7s/wayland/river.nix new file mode 100644 index 0000000..6b0415e --- /dev/null +++ b/hand7s/wayland/river.nix @@ -0,0 +1,112 @@ +{ + config, + pkgs, + lib, + ... +}: { + wayland = { + windowManager = { + river = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "River" + ) + true; + + settings = { + default-layout = "rivertile"; + focus-follows-cursor = "normal"; + border-width = 2; + + declare-mod = [ + "locked" + "normal" + ]; + + xwayland = { + enable = true; + }; + + map = { + normal = { + "Alt Q" = "close"; + "Alt S" = "spawn fuzzel"; + "Alt Return" = "spawn ghostty"; + "Alt L" = "spawn hyprlock"; + "Alt F" = "toggle-fullscreen"; + + "Alt+Shift S" = "spawn wayshot --clipboard"; + "Alt+Shift E" = "exit"; + "Alt+Shift Space" = "toggle-float"; + + "Alt Up" = "send-to-output next"; + "Alt Down" = "send-to-output previous"; + "Alt Right" = "send-to-output next"; + "Alt Left" = "send-to-output previous"; + + "Alt 1" = "set-focused-tags 0"; + "Alt 2" = "set-focused-tags 1"; + "Alt 3" = "set-focused-tags 2"; + "Alt 4" = "set-focused-tags 3"; + "Alt 5" = "set-focused-tags 4"; + "Alt 6" = "set-focused-tags 5"; + "Alt 7" = "set-focused-tags 6"; + "Alt 8" = "set-focused-tags 7"; + "Alt 9" = "set-focused-tags 8"; + "Alt H" = "toggle-focused-tags 20"; + + "Alt+Shift 1" = "set-view-tags 0"; + "Alt+Shift 2" = "set-view-tags 1"; + "Alt+Shift 3" = "set-view-tags 2"; + "Alt+Shift 4" = "set-view-tags 3"; + "Alt+Shift 5" = "set-view-tags 4"; + "Alt+Shift 6" = "set-view-tags 5"; + "Alt+Shift 7" = "set-view-tags 6"; + "Alt+Shift 8" = "set-view-tags 7"; + "Alt+Shift 9" = "set-view-tags 8"; + "Alt+Shift H" = "set-view-tags 20"; + + "Alt+Control 1" = "toggle-focused-tags 0"; + "Alt+Control 2" = "toggle-focused-tags 1"; + "Alt+Control 3" = "toggle-focused-tags 2"; + "Alt+Control 4" = "toggle-focused-tags 3"; + "Alt+Control 5" = "toggle-focused-tags 4"; + "Alt+Control 6" = "toggle-focused-tags 5"; + "Alt+Control 7" = "toggle-focused-tags 6"; + "Alt+Control 8" = "toggle-focused-tags 7"; + "Alt+Control 9" = "toggle-focused-tags 8"; + "Alt+Control H" = "toggle-focused-tags 20"; + + "Alt+Shift+Control 1" = "toggle-view-tags 0"; + "Alt+Shift+Control 2" = "toggle-view-tags 1"; + "Alt+Shift+Control 3" = "toggle-view-tags 2"; + "Alt+Shift+Control 4" = "toggle-view-tags 3"; + "Alt+Shift+Control 5" = "toggle-view-tags 4"; + "Alt+Shift+Control 6" = "toggle-view-tags 5"; + "Alt+Shift+Control 7" = "toggle-view-tags 6"; + "Alt+Shift+Control 8" = "toggle-view-tags 7"; + "Alt+Shift+Control 9" = "toggle-view-tags 8"; + "Alt+Shift+Control H" = "toggle-view-tags 20"; + }; + + map-pointer = { + normal = { + "Alt BTN_LEFT" = "move-view"; + "Alt BTN_RIGHT" = "resize-view"; + }; + }; + }; + }; + + extraConfig = '' + ${lib.getExe' pkgs.river "riverctl"} keyboard-layout -options "grp:caps_toggle" "us,ru" + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=300 ${lib.getExe pkgs.brightnessctl} -s set 10 + ${lib.getExe' pkgs.river "riverctl"} spawn ${lib.getEce pkgs.wayidle} -t=600 ${lib.getExe pkgs.waylock} + ''; + }; + }; + }; +} diff --git a/hand7s/wayland/sway.nix b/hand7s/wayland/sway.nix new file mode 100644 index 0000000..e81b3d1 --- /dev/null +++ b/hand7s/wayland/sway.nix @@ -0,0 +1,185 @@ +{ + config, + pkgs, + lib, + ... +}: { + wayland = { + windowManager = { + sway = { + enable = + lib.mkIf ( + config.home.gui.sessionType == "Sway" + ) + true; + + package = pkgs.sway; + + config = { + bindkeysToCode = true; + defaultWorkspace = "workspace number 1"; + workspaceAutoBackAndForth = true; + + bars = []; + + window = { + border = 2; + titlebar = false; + hideEdgeBorders = "both"; + }; + + floating = { + border = 2; + titlebar = false; + modifier = "Mod1"; + }; + + focus = { + forceWrapping = true; + mouseWarping = true; + + followMouse = "always"; + newWindow = "smart"; + wrapping = "yes"; + }; + + gaps = { + vertical = null; + horizontal = null; + + outer = null; + inner = null; + + top = null; + bottom = null; + left = null; + right = null; + + smartGaps = false; + smartBorders = "no_gaps"; + }; + + startup = [ + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpaper.service"; + } + + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hypridle.service"; + } + + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start hyprpolkitagent.service"; + } + + { + command = "${lib.getExe' pkgs.systemd "systemctl"} --user start yambar.service"; + } + + { + command = "${lib.getExe pkgs.sway-audio-idle-inhibit}"; + } + + { + command = "${lib.getExe pkgs.autotiling-rs}"; + } + + { + command = "${lib.getExe pkgs.swaykbdd}"; + } + ]; + + keybindings = lib.mkOptionDefault { + "Mod1+q" = "kill"; + "Mod1+s" = "exec ${lib.getExe pkgs.fuzzel}"; + "Mod1+Return" = "exec ${lib.getExe pkgs.ghostty}"; + "Mod1+l" = "exec ${lib.getExe pkgs.swaylock}"; + "Mod1+f" = "fullscreen toggle"; + "Mod1+Shift+s" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} --notify copy area /home/hand7s/Pictures/Screenshots/$(date '+%y%m%d_%H-%M-%s').png"; + + "Mod1+Shift+e" = "exec ${lib.getExe' pkgs.sway "swaymsg"} exit"; + "Mod1+Space" = "floating toggle"; + "Mod1+r" = "mode resize"; + + "Mod1+Left" = "focus left"; + "Mod1+Right" = "focus right"; + "Mod1+Up" = "focus up"; + "Mod1+Down" = "focus down"; + + "Mod1+1" = "workspace number 1"; + "Mod1+2" = "workspace number 2"; + "Mod1+3" = "workspace number 3"; + "Mod1+4" = "workspace number 4"; + "Mod1+5" = "workspace number 5"; + "Mod1+6" = "workspace number 6"; + "Mod1+7" = "workspace number 7"; + "Mod1+8" = "workspace number 8"; + "Mod1+9" = "workspace number 9"; + "Mod1+0" = "workspace number 10"; + "Mod1+h" = "scratchpad show"; + + "Mod1+Shift+1" = "move container to workspace number 1"; + "Mod1+Shift+2" = "move container to workspace number 2"; + "Mod1+Shift+3" = "move container to workspace number 3"; + "Mod1+Shift+4" = "move container to workspace number 4"; + "Mod1+Shift+5" = "move container to workspace number 5"; + "Mod1+Shift+6" = "move container to workspace number 6"; + "Mod1+Shift+7" = "move container to workspace number 7"; + "Mod1+Shift+8" = "move container to workspace number 8"; + "Mod1+Shift+9" = "move container to workspace number 9"; + "Mod1+Shift+0" = "move container to workspace number 10"; + "Mod1+Shift+h" = "move scratchpad"; + + "XF86AudioRaiseVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%+"; + "XF86AudioLowerVolume" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-volume @DEFAULT_AUDIO_SINK@ 5%-"; + "XF86AudioMute" = "exec ${lib.getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle"; + + "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause"; + "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous"; + "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next"; + + "XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.brightnessctl} set 5%-"; + "XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.brightnessctl} set +5%"; + }; + + modes = { + resize = { + "Left" = "resize shrink width 10px"; + "Right" = "resize shrink width 10px"; + "Up" = "resize shrink height 10px"; + "Down" = "resize shrink height 10px"; + + "Shift+Left" = "resize grow width 10px"; + "Shift+Right" = "resize grow width 10px"; + "Shift+Up" = "resize grow height 10px"; + "Shift+Down" = "resize grow height 10px"; + "Escape" = "mode default"; + "Return" = "mode default"; + }; + }; + + input = { + "type:pointer" = { + accel_profile = "flat"; + pointer_accel = "0"; + }; + + "type:keyboard" = { + xkb_layout = "us,ru"; + xkb_options = "grp:caps_toggle"; + }; + + "type:touchpad" = { + natural_scroll = "enabled"; + tap = "enabled"; + }; + }; + }; + + extraConfig = '' + bindswitch lid:on exec swaylock + ''; + }; + }; + }; +} diff --git a/isla/default.nix b/isla/default.nix deleted file mode 100644 index 08bdc02..0000000 --- a/isla/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{self, ...}: { - imports = [ - "${self}/isla/disko/disk.nix" - "${self}/isla/disko/lvm_vg.nix" - - "${self}/isla/boot/loader/system-boot.nix" - "${self}/isla/boot/lanzaboote.nix" - "${self}/isla/boot/initrd.nix" - "${self}/isla/boot/kernel.nix" - "${self}/isla/boot/plymouth.nix" - "${self}/isla/boot/tmp.nix" - - "${self}/isla/console/console.nix" - - "${self}/isla/environment/systemPackages.nix" - "${self}/isla/environment/variables.nix" - - "${self}/isla/hardware/cpu.nix" - "${self}/isla/hardware/graphics.nix" - "${self}/isla/hardware/qmk.nix" - "${self}/isla/hardware/zram.nix" - - "${self}/isla/home-manager/users.nix" - - "${self}/isla/i18n/locales.nix" - - "${self}/isla/networking/dhcp.nix" - "${self}/isla/networking/firewall.nix" - "${self}/isla/networking/hostname.nix" - "${self}/isla/networking/networkmanager.nix" - "${self}/isla/networking/wireguard.nix" - "${self}/isla/networking/nameservers.nix" - "${self}/isla/networking/hosts.nix" - "${self}/isla/networking/hostId.nix" - - "${self}/isla/nix/package.nix" - "${self}/isla/nix/settings/allowed-users.nix" - "${self}/isla/nix/settings/experimental-features.nix" - "${self}/isla/nix/settings/substituters.nix" - "${self}/isla/nix/settings/trusted-public-keys.nix" - "${self}/isla/nix/settings/trusted-users.nix" - - "${self}/isla/nixpkgs/config.nix" - "${self}/isla/nixpkgs/system.nix" - - "${self}/isla/programs/gamemode.nix" - "${self}/isla/programs/nh.nix" - "${self}/isla/programs/steam.nix" - "${self}/isla/programs/ssh.nix" - "${self}/isla/programs/yubikey-touch-detector.nix" - - "${self}/isla/security/polkit.nix" - "${self}/isla/security/rtkit.nix" - "${self}/isla/security/sudo.nix" - "${self}/isla/security/sudo-rs.nix" - "${self}/isla/security/pam/services.nix" - - "${self}/isla/services/fprintd.nix" - "${self}/isla/services/greetd.nix" - "${self}/isla/services/libinput.nix" - "${self}/isla/services/openssh.nix" - "${self}/isla/services/pipewire.nix" - "${self}/isla/services/qmk.nix" - "${self}/isla/services/thinkfan.nix" - "${self}/isla/services/usbmuxd.nix" - "${self}/isla/services/xserver.nix" - "${self}/isla/services/zapret.nix" - "${self}/isla/services/zerotier.nix" - "${self}/isla/services/yggdrasil.nix" - "${self}/isla/services/netbird.nix" - "${self}/isla/services/yubikey-agent.nix" - - "${self}/isla/sops/defaults.nix" - "${self}/isla/sops/secrets.nix" - - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" - - "${self}/isla/system/name.nix" - "${self}/isla/system/stateVersion.nix" - - "${self}/isla/systemd/oomd.nix" - - "${self}/isla/time/timeZone.nix" - - "${self}/isla/users/users/hand7s.nix" - "${self}/isla/users/users/root.nix" - "${self}/isla/users/mutableUsers.nix" - - "${self}/isla/virtualisation/docker.nix" - - "${self}/isla/xdg/icons.nix" - "${self}/isla/xdg/mime.nix" - "${self}/isla/xdg/portal.nix" - ]; -} diff --git a/kyra/default.nix b/kyra/default.nix deleted file mode 100644 index 7624558..0000000 --- a/kyra/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{self, ...}: { - imports = [ - "${self}/kyra/disko/disk.nix" - "${self}/kyra/disko/lvm_vg.nix" - - "${self}/kyra/boot/initrd/availableKernelModules.nix" - "${self}/kyra/boot/initrd/kernelModules.nix" - "${self}/kyra/boot/loader/grub.nix" - "${self}/kyra/boot/kernel.nix" - "${self}/kyra/boot/tmp.nix" - - "${self}/kyra/environment/systemPackages.nix" - - "${self}/kyra/hardware/zram.nix" - - "${self}/kyra/home-manager/users.nix" - - "${self}/kyra/networking/interfaces/ens3.nix" - "${self}/kyra/networking/firewall/ens3.nix" - "${self}/kyra/networking/firewall.nix" - "${self}/kyra/networking/dns.nix" - "${self}/kyra/networking/wireguard.nix" - "${self}/kyra/networking/defaultGateway.nix" - - "${self}/kyra/nix/settings/allowed-users.nix" - "${self}/kyra/nix/settings/experimental-features.nix" - "${self}/kyra/nix/settings/substituters.nix" - "${self}/kyra/nix/settings/trusted-public-keys.nix" - "${self}/kyra/nix/settings/trusted-users.nix" - "${self}/kyra/nix/settings/auto-optimise-store.nix" - - "${self}/kyra/nixpkgs/config.nix" - "${self}/kyra/nixpkgs/platform.nix" - - "${self}/kyra/programs/nh.nix" - - "${self}/kyra/services/openssh.nix" - "${self}/kyra/services/fail2ban.nix" - "${self}/kyra/services/netbird.nix" - "${self}/kyra/services/qemuGuest.nix" - "${self}/kyra/services/caddy.nix" - "${self}/kyra/services/sing-box.nix" - - "${self}/kyra/sops/age.nix" - "${self}/kyra/sops/defaults.nix" - "${self}/kyra/sops/secrets.nix" - - "${self}/kyra/system/stateVersion.nix" - - "${self}/kyra/users/users.nix" - "${self}/kyra/users/users/alep0u.nix" - "${self}/kyra/users/users/hand7s.nix" - "${self}/kyra/users/users/root.nix" - - "${self}/kyra/virtualisation/docker.nix" - ]; -} diff --git a/kyra/home-manager/users.nix b/kyra/home-manager/users.nix deleted file mode 100644 index 6590188..0000000 --- a/kyra/home-manager/users.nix +++ /dev/null @@ -1,27 +0,0 @@ -{self, ...}: { - home-manager = { - users = { - "hand7s" = { - imports = [ - "${self}/hand7s/" - self.inputs.agenix.homeManagerModules.default - self.inputs.spicetify-nix.homeManagerModules.default - self.inputs.hyprland.homeManagerModules.default - self.inputs.chaotic.homeManagerModules.default - self.inputs.sops-nix.homeManagerModules.sops - - self.inputs.nix-index-database.homeModules.nix-index - self.inputs.noctalia.homeModules.default - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - self - ; - }; - }; -} diff --git a/kyra/networking/defaultGateway.nix b/kyra/networking/defaultGateway.nix deleted file mode 100644 index dd70ea4..0000000 --- a/kyra/networking/defaultGateway.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - lib, - config, - ... -}: { - networking = { - defaultGateway = lib.mkIf (config.networking.hostName == "mel") { - address = "45.11.229.1"; - interface = "ens3"; - }; - - defaultGateway6 = lib.mkIf (config.networking.hostName == "mel") { - address = "2a0e:97c0:3e3:2Oa::1"; - interface = "ens3"; - }; - }; -} diff --git a/kyra/networking/firewall/ens3.nix b/kyra/networking/firewall/ens3.nix deleted file mode 100644 index 7df7284..0000000 --- a/kyra/networking/firewall/ens3.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - config, - lib, - ... -}: { - networking = { - firewall = { - interfaces = { - ens3 = { - allowedUDPPorts = - [ - 53580 - 53590 - ] - ++ lib.optionals (config.networking.hostName == "hazel") [ - 443 - - 25565 - - 24 - 25 - 110 - 143 - 465 - 587 - 993 - 995 - 4190 - 53570 - ]; - - allowedTCPPorts = - [ - 53580 - 53590 - ] - ++ lib.optionals (config.networking.hostName == "hazel") [ - 443 - - 25565 - - 24 - 25 - 110 - 143 - 465 - 587 - 993 - 995 - 4190 - 53570 - ]; - }; - }; - }; - }; -} diff --git a/kyra/networking/hostname.nix b/kyra/networking/hostname.nix deleted file mode 100644 index 7371866..0000000 --- a/kyra/networking/hostname.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - networking = { - hostName = "kyra"; - }; -} diff --git a/kyra/networking/interfaces/ens3.nix b/kyra/networking/interfaces/ens3.nix deleted file mode 100644 index 3820e1f..0000000 --- a/kyra/networking/interfaces/ens3.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - ... -}: { - networking = { - interfaces = { - ens3 = { - ipv4 = { - addresses = lib.optionals (config.networking.hostName == "mel") [ - { - address = "45.11.229.254"; - prefixLength = 24; - } - ]; - }; - - ipv6 = { - addresses = - lib.optionals (config.networking.hostName == "hazel") [ - { - address = "2a03:6f01:1:2::cb1e"; - prefixLength = 64; - } - ] - ++ lib.optionals (config.networking.hostName == "mel") [ - { - address = "2a0e:97c0:3e3:2Oa::1"; - prefixLength = 64; - } - ]; - }; - }; - }; - }; -} diff --git a/kyra/nix/settings/substituters.nix b/kyra/nix/settings/substituters.nix deleted file mode 100644 index da0035f..0000000 --- a/kyra/nix/settings/substituters.nix +++ /dev/null @@ -1,19 +0,0 @@ -_: { - nix = { - settings = { - substituters = [ - # cache.nixos.org - "https://cache.nixos.org" - # cache.garnix.org - "https://cache.garnix.io" - # cachix - "https://nix-community.cachix.org/" - "https://chaotic-nyx.cachix.org/" - "https://hyprland.cachix.org" - "https://chaotic-nyx.cachix.org/" - # nix-community - "https://hydra.nix-community.org/" - ]; - }; - }; -} diff --git a/kyra/nixpkgs/config.nix b/kyra/nixpkgs/config.nix deleted file mode 100644 index 13ed34c..0000000 --- a/kyra/nixpkgs/config.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - nixpkgs = { - config = { - allowBroken = true; - allowUnfree = true; - }; - }; -} diff --git a/kyra/users/users/alep0u.nix b/kyra/users/users/alep0u.nix deleted file mode 100644 index faf1630..0000000 --- a/kyra/users/users/alep0u.nix +++ /dev/null @@ -1,23 +0,0 @@ -_: { - users = { - users = { - "alep0u" = { - description = "alep0u"; - isNormalUser = true; - password = "alep0u"; - extraGroups = [ - "wheel" - "docker" - ]; - - openssh = { - authorizedKeys = { - keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIItDketCj5COoCvAPLhqOcBhWC1H50MApP2gDt/lkW7E alep0u@alep0u" - ]; - }; - }; - }; - }; - }; -} diff --git a/viola/boot/initrd.nix b/s0meMiniPC-nix/boot/initrd.nix similarity index 88% rename from viola/boot/initrd.nix rename to s0meMiniPC-nix/boot/initrd.nix index 86f16c1..568c6d0 100644 --- a/viola/boot/initrd.nix +++ b/s0meMiniPC-nix/boot/initrd.nix @@ -1,4 +1,4 @@ -_: { +{lib, ...}: { boot = { initrd = { availableKernelModules = [ @@ -14,6 +14,7 @@ _: { supportedFilesystems = { vfat = true; btrfs = true; + zfs = lib.mkForce true; }; systemd = { diff --git a/viola/boot/kernel.nix b/s0meMiniPC-nix/boot/kernel.nix similarity index 91% rename from viola/boot/kernel.nix rename to s0meMiniPC-nix/boot/kernel.nix index 275cc4c..5f182f8 100644 --- a/viola/boot/kernel.nix +++ b/s0meMiniPC-nix/boot/kernel.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + lib, + ... +}: { boot = { kernel = { sysctl = { @@ -12,6 +16,7 @@ }; }; + kernelPackages = pkgs.linuxPackages_cachyos-server; extraModulePackages = with config.boot.kernelPackages; [ rtl8821ce yt6801 @@ -30,7 +35,6 @@ "page_alloc.shuffle=1" "page_poison=1" "slab_nomerge" - "zswap.enabled=0" "kernel.watchdog=0" "oops=panic" @@ -69,6 +73,7 @@ supportedFilesystems = { vfat = true; btrfs = true; + zfs = lib.mkForce true; }; consoleLogLevel = 0; diff --git a/ada/boot/lanzaboote.nix b/s0meMiniPC-nix/boot/lanzaboote.nix similarity index 85% rename from ada/boot/lanzaboote.nix rename to s0meMiniPC-nix/boot/lanzaboote.nix index 8036b8a..4a1320e 100644 --- a/ada/boot/lanzaboote.nix +++ b/s0meMiniPC-nix/boot/lanzaboote.nix @@ -1,7 +1,7 @@ -_: { +{...}: { boot = { lanzaboote = { - enable = true; + enable = false; configurationLimit = 7; pkiBundle = "/var/lib/sbctl"; settings = { diff --git a/ada/boot/loader/systemd-boot.nix b/s0meMiniPC-nix/boot/loader/systemd-boot.nix similarity index 97% rename from ada/boot/loader/systemd-boot.nix rename to s0meMiniPC-nix/boot/loader/systemd-boot.nix index d8ebe95..8e2989c 100644 --- a/ada/boot/loader/systemd-boot.nix +++ b/s0meMiniPC-nix/boot/loader/systemd-boot.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { loader = { systemd-boot = { diff --git a/ada/boot/plymouth.nix b/s0meMiniPC-nix/boot/plymouth.nix similarity index 100% rename from ada/boot/plymouth.nix rename to s0meMiniPC-nix/boot/plymouth.nix diff --git a/isla/boot/tmp.nix b/s0meMiniPC-nix/boot/tmp.nix similarity index 100% rename from isla/boot/tmp.nix rename to s0meMiniPC-nix/boot/tmp.nix diff --git a/s0meMiniPC-nix/boot/zfs.nix b/s0meMiniPC-nix/boot/zfs.nix new file mode 100644 index 0000000..f6d2f2d --- /dev/null +++ b/s0meMiniPC-nix/boot/zfs.nix @@ -0,0 +1,9 @@ +{...}: { + boot = { + zfs = { + package = pkgs.zfs_cachyos; + allowHibernation = false; + removeLinuxDRM = false; + }; + }; +} diff --git a/isla/console/console.nix b/s0meMiniPC-nix/console/console.nix similarity index 100% rename from isla/console/console.nix rename to s0meMiniPC-nix/console/console.nix diff --git a/s0meMiniPC-nix/default.nix b/s0meMiniPC-nix/default.nix new file mode 100644 index 0000000..767de1a --- /dev/null +++ b/s0meMiniPC-nix/default.nix @@ -0,0 +1,96 @@ +{self, ...}: { + imports = [ + "${self}/s0meMiniPC-nix/boot/initrd.nix" + "${self}/s0meMiniPC-nix/boot/kernel.nix" + "${self}/s0meMiniPC-nix/boot/lanzaboote.nix" + "${self}/s0meMiniPC-nix/boot/plymouth.nix" + "${self}/s0meMiniPC-nix/boot/tmp.nix" + "${self}/s0meMiniPC-nix/boot/loader/systemd-boot.nix" + "${self}/s0meMiniPC-nix/boot/zfs.nix" + + "${self}/s0meMiniPC-nix/disko/disk.nix" + "${self}/s0meMiniPC-nix/disko/lvm_vg.nix" + + "${self}/s0meMiniPC-nix/console/console.nix" + + "${self}/s0meMiniPC-nix/environment/systemPackages.nix" + "${self}/s0meMiniPC-nix/environment/variables.nix" + + "${self}/s0meMiniPC-nix/hardware/cpu.nix" + "${self}/s0meMiniPC-nix/hardware/graphics.nix" + "${self}/s0meMiniPC-nix/hardware/zram.nix" + + "${self}/s0meMiniPC-nix/home-manager/users.nix" + + "${self}/s0meMiniPC-nix/i18n/locales.nix" + + "${self}/s0meMiniPC-nix/networking/dhcp.nix" + "${self}/s0meMiniPC-nix/networking/firewall.nix" + "${self}/s0meMiniPC-nix/networking/hostname.nix" + "${self}/s0meMiniPC-nix/networking/networkmanager.nix" + "${self}/s0meMiniPC-nix/networking/wireguard.nix" + "${self}/s0meMiniPC-nix/networking/nameservers.nix" + "${self}/s0meMiniPC-nix/networking/hosts.nix" + "${self}/s0meMiniPC-nix/networking/hostId.nix" + "${self}/s0meMiniPC-nix/networking/interfaces.nix" + + "${self}/s0meMiniPC-nix/nix/package.nix" + "${self}/s0meMiniPC-nix/nix/settings/allowed-users.nix" + "${self}/s0meMiniPC-nix/nix/settings/experimental-features.nix" + "${self}/s0meMiniPC-nix/nix/settings/substituters.nix" + "${self}/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0meMiniPC-nix/nix/settings/trusted-users.nix" + "${self}/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix" + + "${self}/s0meMiniPC-nix/nixpkgs/config.nix" + "${self}/s0meMiniPC-nix/nixpkgs/system.nix" + + "${self}/s0meMiniPC-nix/programs/nh.nix" + "${self}/s0meMiniPC-nix/programs/ssh.nix" + + "${self}/s0meMiniPC-nix/security/polkit.nix" + "${self}/s0meMiniPC-nix/security/rtkit.nix" + "${self}/s0meMiniPC-nix/security/sudo.nix" + "${self}/s0meMiniPC-nix/security/sudo-rs.nix" + + "${self}/s0meMiniPC-nix/services/greetd.nix" + "${self}/s0meMiniPC-nix/services/libinput.nix" + "${self}/s0meMiniPC-nix/services/openssh.nix" + "${self}/s0meMiniPC-nix/services/pipewire.nix" + "${self}/s0meMiniPC-nix/services/netbird.nix" + "${self}/s0meMiniPC-nix/services/scx.nix" + "${self}/s0meMiniPC-nix/services/xserver.nix" + "${self}/s0meMiniPC-nix/services/zapret.nix" + "${self}/s0meMiniPC-nix/services/zerotier.nix" + "${self}/s0meMiniPC-nix/services/usbmuxd.nix" + "${self}/s0meMiniPC-nix/services/irqbalance.nix" + "${self}/s0meMiniPC-nix/services/forgejo.nix" + "${self}/s0meMiniPC-nix/services/privatebin.nix" + "${self}/s0meMiniPC-nix/services/homepage.nix" + "${self}/s0meMiniPC-nix/services/zitadel.nix" + "${self}/s0meMiniPC-nix/sops/defaults.nix" + "${self}/s0meMiniPC-nix/sops/secrets.nix" + + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" + + "${self}/s0meMiniPC-nix/system/name.nix" + "${self}/s0meMiniPC-nix/system/stateVersion.nix" + + "${self}/s0meMiniPC-nix/systemd/oomd.nix" + "${self}/s0meMiniPC-nix/systemd/slices/system-slice.nix" + "${self}/s0meMiniPC-nix/systemd/slices/user-slice.nix" + "${self}/s0meMiniPC-nix/systemd/slices/root-slice.nix" + + "${self}/s0meMiniPC-nix/time/timeZone.nix" + + "${self}/s0meMiniPC-nix/users/users/hand7s.nix" + "${self}/s0meMiniPC-nix/users/users/root.nix" + "${self}/s0meMiniPC-nix/users/mutableUsers.nix" + + "${self}/s0meMiniPC-nix/virtualisation/docker.nix" + ]; +} diff --git a/viola/disko/disk.nix b/s0meMiniPC-nix/disko/disk.nix similarity index 100% rename from viola/disko/disk.nix rename to s0meMiniPC-nix/disko/disk.nix diff --git a/ada/disko/lvm_vg.nix b/s0meMiniPC-nix/disko/lvm_vg.nix similarity index 100% rename from ada/disko/lvm_vg.nix rename to s0meMiniPC-nix/disko/lvm_vg.nix diff --git a/viola/environment/systemPackages.nix b/s0meMiniPC-nix/environment/systemPackages.nix similarity index 86% rename from viola/environment/systemPackages.nix rename to s0meMiniPC-nix/environment/systemPackages.nix index 4801164..28deca2 100644 --- a/viola/environment/systemPackages.nix +++ b/s0meMiniPC-nix/environment/systemPackages.nix @@ -10,7 +10,5 @@ uutils-diffutils home-manager ]; - - enableAllTerminfo = false; }; } diff --git a/ada/environment/variables.nix b/s0meMiniPC-nix/environment/variables.nix similarity index 86% rename from ada/environment/variables.nix rename to s0meMiniPC-nix/environment/variables.nix index 9c47685..52c5a9e 100644 --- a/ada/environment/variables.nix +++ b/s0meMiniPC-nix/environment/variables.nix @@ -1,7 +1,7 @@ {config, ...}: { environment = { variables = { - AMD_VULKAN_ICD = "AMDVLK"; + AMD_VULKAN_ICD = "RADV"; HOSTNAME = config.networking.hostName; QT_QPA_PLATFORM = "wayland"; SDL_VIDEODRIVER = "wayland"; @@ -13,5 +13,7 @@ GRIMBLAST_HIDE_CURSOR = "0"; TERM = "xterm-256color"; }; + + enableAllTerminfo = true; }; } diff --git a/isla/hardware/cpu.nix b/s0meMiniPC-nix/hardware/cpu.nix similarity index 100% rename from isla/hardware/cpu.nix rename to s0meMiniPC-nix/hardware/cpu.nix diff --git a/viola/hardware/graphics.nix b/s0meMiniPC-nix/hardware/graphics.nix similarity index 91% rename from viola/hardware/graphics.nix rename to s0meMiniPC-nix/hardware/graphics.nix index 76c79bf..f81ccb7 100644 --- a/viola/hardware/graphics.nix +++ b/s0meMiniPC-nix/hardware/graphics.nix @@ -1,4 +1,4 @@ -_: { +{...}: { hardware = { graphics = { enable = true; diff --git a/isla/hardware/zram.nix b/s0meMiniPC-nix/hardware/zram.nix similarity index 100% rename from isla/hardware/zram.nix rename to s0meMiniPC-nix/hardware/zram.nix diff --git a/isla/home-manager/users.nix b/s0meMiniPC-nix/home-manager/users.nix similarity index 100% rename from isla/home-manager/users.nix rename to s0meMiniPC-nix/home-manager/users.nix diff --git a/isla/i18n/locales.nix b/s0meMiniPC-nix/i18n/locales.nix similarity index 100% rename from isla/i18n/locales.nix rename to s0meMiniPC-nix/i18n/locales.nix diff --git a/ada/networking/dhcp.nix b/s0meMiniPC-nix/networking/dhcp.nix similarity index 100% rename from ada/networking/dhcp.nix rename to s0meMiniPC-nix/networking/dhcp.nix diff --git a/viola/networking/firewall.nix b/s0meMiniPC-nix/networking/firewall.nix similarity index 51% rename from viola/networking/firewall.nix rename to s0meMiniPC-nix/networking/firewall.nix index 04c13fd..7023a46 100644 --- a/viola/networking/firewall.nix +++ b/s0meMiniPC-nix/networking/firewall.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { firewall = { allowPing = true; @@ -8,48 +8,18 @@ _: { 80 8080 8443 - 8980 53350 53351 53353 - - # mc - 25565 - - # mail - 24 - 25 - 110 - 143 - 465 - 587 - 993 - 995 - 4190 ]; allowedTCPPorts = [ 80 8080 8443 - 8980 53350 53351 53353 - - # mc - 25565 - - # mail - 24 - 25 - 110 - 143 - 465 - 587 - 993 - 995 - 4190 ]; }; }; diff --git a/viola/networking/hostId.nix b/s0meMiniPC-nix/networking/hostId.nix similarity index 84% rename from viola/networking/hostId.nix rename to s0meMiniPC-nix/networking/hostId.nix index b0a983f..10b6b21 100644 --- a/viola/networking/hostId.nix +++ b/s0meMiniPC-nix/networking/hostId.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { hostId = "5c79d46a"; }; diff --git a/s0meMiniPC-nix/networking/hostname.nix b/s0meMiniPC-nix/networking/hostname.nix new file mode 100644 index 0000000..ba82957 --- /dev/null +++ b/s0meMiniPC-nix/networking/hostname.nix @@ -0,0 +1,5 @@ +{...}: { + networking = { + hostName = "s0meMiniPC-nix"; + }; +} diff --git a/ada/networking/hosts.nix b/s0meMiniPC-nix/networking/hosts.nix similarity index 86% rename from ada/networking/hosts.nix rename to s0meMiniPC-nix/networking/hosts.nix index e42e2b1..04747e5 100644 --- a/ada/networking/hosts.nix +++ b/s0meMiniPC-nix/networking/hosts.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { hosts = { # nope diff --git a/viola/networking/interfaces.nix b/s0meMiniPC-nix/networking/interfaces.nix similarity index 91% rename from viola/networking/interfaces.nix rename to s0meMiniPC-nix/networking/interfaces.nix index 03a3a3e..26f5eb8 100644 --- a/viola/networking/interfaces.nix +++ b/s0meMiniPC-nix/networking/interfaces.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { firewall = { interfaces = { @@ -8,7 +8,6 @@ _: { 6969 8080 8443 - 8980 53350 53351 53352 @@ -19,7 +18,6 @@ _: { 6969 8080 8443 - 8980 53350 53351 53352 diff --git a/isla/networking/nameservers.nix b/s0meMiniPC-nix/networking/nameservers.nix similarity index 100% rename from isla/networking/nameservers.nix rename to s0meMiniPC-nix/networking/nameservers.nix diff --git a/viola/networking/networkmanager.nix b/s0meMiniPC-nix/networking/networkmanager.nix similarity index 91% rename from viola/networking/networkmanager.nix rename to s0meMiniPC-nix/networking/networkmanager.nix index 474d212..3d66f30 100644 --- a/viola/networking/networkmanager.nix +++ b/s0meMiniPC-nix/networking/networkmanager.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { networkmanager = { enable = false; diff --git a/isla/networking/timeServers.nix b/s0meMiniPC-nix/networking/timeServers.nix similarity index 100% rename from isla/networking/timeServers.nix rename to s0meMiniPC-nix/networking/timeServers.nix diff --git a/isla/networking/wireguard.nix b/s0meMiniPC-nix/networking/wireguard.nix similarity index 100% rename from isla/networking/wireguard.nix rename to s0meMiniPC-nix/networking/wireguard.nix diff --git a/ada/nix/package.nix b/s0meMiniPC-nix/nix/package.nix similarity index 100% rename from ada/nix/package.nix rename to s0meMiniPC-nix/nix/package.nix diff --git a/isla/nix/settings/allowed-users.nix b/s0meMiniPC-nix/nix/settings/allowed-users.nix similarity index 100% rename from isla/nix/settings/allowed-users.nix rename to s0meMiniPC-nix/nix/settings/allowed-users.nix diff --git a/isla/nix/settings/auto-optimise-store.nix b/s0meMiniPC-nix/nix/settings/auto-optimise-store.nix similarity index 100% rename from isla/nix/settings/auto-optimise-store.nix rename to s0meMiniPC-nix/nix/settings/auto-optimise-store.nix diff --git a/isla/nix/settings/experimental-features.nix b/s0meMiniPC-nix/nix/settings/experimental-features.nix similarity index 100% rename from isla/nix/settings/experimental-features.nix rename to s0meMiniPC-nix/nix/settings/experimental-features.nix diff --git a/isla/nix/settings/substituters.nix b/s0meMiniPC-nix/nix/settings/substituters.nix similarity index 100% rename from isla/nix/settings/substituters.nix rename to s0meMiniPC-nix/nix/settings/substituters.nix diff --git a/isla/nix/settings/trusted-public-keys.nix b/s0meMiniPC-nix/nix/settings/trusted-public-keys.nix similarity index 100% rename from isla/nix/settings/trusted-public-keys.nix rename to s0meMiniPC-nix/nix/settings/trusted-public-keys.nix diff --git a/isla/nix/settings/trusted-users.nix b/s0meMiniPC-nix/nix/settings/trusted-users.nix similarity index 100% rename from isla/nix/settings/trusted-users.nix rename to s0meMiniPC-nix/nix/settings/trusted-users.nix diff --git a/isla/nixpkgs/config.nix b/s0meMiniPC-nix/nixpkgs/config.nix similarity index 100% rename from isla/nixpkgs/config.nix rename to s0meMiniPC-nix/nixpkgs/config.nix diff --git a/isla/nixpkgs/overlays.nix b/s0meMiniPC-nix/nixpkgs/overlays.nix similarity index 100% rename from isla/nixpkgs/overlays.nix rename to s0meMiniPC-nix/nixpkgs/overlays.nix diff --git a/isla/nixpkgs/system.nix b/s0meMiniPC-nix/nixpkgs/system.nix similarity index 100% rename from isla/nixpkgs/system.nix rename to s0meMiniPC-nix/nixpkgs/system.nix diff --git a/isla/programs/nh.nix b/s0meMiniPC-nix/programs/nh.nix similarity index 100% rename from isla/programs/nh.nix rename to s0meMiniPC-nix/programs/nh.nix diff --git a/isla/programs/ssh.nix b/s0meMiniPC-nix/programs/ssh.nix similarity index 100% rename from isla/programs/ssh.nix rename to s0meMiniPC-nix/programs/ssh.nix diff --git a/isla/security/polkit.nix b/s0meMiniPC-nix/security/polkit.nix similarity index 100% rename from isla/security/polkit.nix rename to s0meMiniPC-nix/security/polkit.nix diff --git a/isla/security/rtkit.nix b/s0meMiniPC-nix/security/rtkit.nix similarity index 100% rename from isla/security/rtkit.nix rename to s0meMiniPC-nix/security/rtkit.nix diff --git a/isla/security/sudo-rs.nix b/s0meMiniPC-nix/security/sudo-rs.nix similarity index 100% rename from isla/security/sudo-rs.nix rename to s0meMiniPC-nix/security/sudo-rs.nix diff --git a/ada/security/sudo.nix b/s0meMiniPC-nix/security/sudo.nix similarity index 100% rename from ada/security/sudo.nix rename to s0meMiniPC-nix/security/sudo.nix diff --git a/viola/services/forgejo.nix b/s0meMiniPC-nix/services/forgejo.nix similarity index 100% rename from viola/services/forgejo.nix rename to s0meMiniPC-nix/services/forgejo.nix diff --git a/viola/services/greetd.nix b/s0meMiniPC-nix/services/greetd.nix similarity index 100% rename from viola/services/greetd.nix rename to s0meMiniPC-nix/services/greetd.nix diff --git a/viola/services/homepage.nix b/s0meMiniPC-nix/services/homepage.nix similarity index 100% rename from viola/services/homepage.nix rename to s0meMiniPC-nix/services/homepage.nix diff --git a/wanda/services/irqbalance.nix b/s0meMiniPC-nix/services/irqbalance.nix similarity index 88% rename from wanda/services/irqbalance.nix rename to s0meMiniPC-nix/services/irqbalance.nix index ee8472e..2b3b1dd 100644 --- a/wanda/services/irqbalance.nix +++ b/s0meMiniPC-nix/services/irqbalance.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { irqbalance = { enable = true; diff --git a/ada/services/libinput.nix b/s0meMiniPC-nix/services/libinput.nix similarity index 97% rename from ada/services/libinput.nix rename to s0meMiniPC-nix/services/libinput.nix index 23c2953..d859d7f 100644 --- a/ada/services/libinput.nix +++ b/s0meMiniPC-nix/services/libinput.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { libinput = { enable = true; diff --git a/isla/services/netbird.nix b/s0meMiniPC-nix/services/netbird.nix similarity index 100% rename from isla/services/netbird.nix rename to s0meMiniPC-nix/services/netbird.nix diff --git a/viola/services/openssh.nix b/s0meMiniPC-nix/services/openssh.nix similarity index 100% rename from viola/services/openssh.nix rename to s0meMiniPC-nix/services/openssh.nix diff --git a/isla/services/pipewire.nix b/s0meMiniPC-nix/services/pipewire.nix similarity index 100% rename from isla/services/pipewire.nix rename to s0meMiniPC-nix/services/pipewire.nix diff --git a/viola/services/privatebin.nix b/s0meMiniPC-nix/services/privatebin.nix similarity index 100% rename from viola/services/privatebin.nix rename to s0meMiniPC-nix/services/privatebin.nix diff --git a/viola/services/scx.nix b/s0meMiniPC-nix/services/scx.nix similarity index 66% rename from viola/services/scx.nix rename to s0meMiniPC-nix/services/scx.nix index 9e4e423..a60071f 100644 --- a/viola/services/scx.nix +++ b/s0meMiniPC-nix/services/scx.nix @@ -1,7 +1,8 @@ -_: { +{...}: { services = { scx = { enable = true; + # package = pkgs.scx_git.full; scheduler = "scx_lavd"; }; }; diff --git a/ada/services/usbmuxd.nix b/s0meMiniPC-nix/services/usbmuxd.nix similarity index 100% rename from ada/services/usbmuxd.nix rename to s0meMiniPC-nix/services/usbmuxd.nix diff --git a/viola/services/xserver.nix b/s0meMiniPC-nix/services/xserver.nix similarity index 100% rename from viola/services/xserver.nix rename to s0meMiniPC-nix/services/xserver.nix diff --git a/isla/services/zapret.nix b/s0meMiniPC-nix/services/zapret.nix similarity index 100% rename from isla/services/zapret.nix rename to s0meMiniPC-nix/services/zapret.nix diff --git a/wanda/services/zerotier.nix b/s0meMiniPC-nix/services/zerotier.nix similarity index 63% rename from wanda/services/zerotier.nix rename to s0meMiniPC-nix/services/zerotier.nix index 42e91a8..4d032aa 100644 --- a/wanda/services/zerotier.nix +++ b/s0meMiniPC-nix/services/zerotier.nix @@ -1,9 +1,9 @@ -_: { +{...}: { services = { zerotierone = { - enable = true; + enable = false; joinNetworks = [ - # + # nope ]; }; }; diff --git a/viola/services/zitadel.nix b/s0meMiniPC-nix/services/zitadel.nix similarity index 100% rename from viola/services/zitadel.nix rename to s0meMiniPC-nix/services/zitadel.nix diff --git a/ada/system/name.nix b/s0meMiniPC-nix/system/name.nix similarity index 100% rename from ada/system/name.nix rename to s0meMiniPC-nix/system/name.nix diff --git a/ada/system/stateVersion.nix b/s0meMiniPC-nix/system/stateVersion.nix similarity index 100% rename from ada/system/stateVersion.nix rename to s0meMiniPC-nix/system/stateVersion.nix diff --git a/isla/systemd/oomd.nix b/s0meMiniPC-nix/systemd/oomd.nix similarity index 100% rename from isla/systemd/oomd.nix rename to s0meMiniPC-nix/systemd/oomd.nix diff --git a/wanda/systemd/slices/root-slice.nix b/s0meMiniPC-nix/systemd/slices/root-slice.nix similarity index 96% rename from wanda/systemd/slices/root-slice.nix rename to s0meMiniPC-nix/systemd/slices/root-slice.nix index 6a386e9..118ca0b 100644 --- a/wanda/systemd/slices/root-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/root-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { root = { diff --git a/viola/systemd/slices/system-slice.nix b/s0meMiniPC-nix/systemd/slices/system-slice.nix similarity index 96% rename from viola/systemd/slices/system-slice.nix rename to s0meMiniPC-nix/systemd/slices/system-slice.nix index 4de4bba..148f19b 100644 --- a/viola/systemd/slices/system-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/system-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { system = { diff --git a/ada/systemd/slices/user-slice.nix b/s0meMiniPC-nix/systemd/slices/user-slice.nix similarity index 96% rename from ada/systemd/slices/user-slice.nix rename to s0meMiniPC-nix/systemd/slices/user-slice.nix index 311e668..21d74d8 100644 --- a/ada/systemd/slices/user-slice.nix +++ b/s0meMiniPC-nix/systemd/slices/user-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { user = { diff --git a/isla/time/timeZone.nix b/s0meMiniPC-nix/time/timeZone.nix similarity index 100% rename from isla/time/timeZone.nix rename to s0meMiniPC-nix/time/timeZone.nix diff --git a/isla/users/mutableUsers.nix b/s0meMiniPC-nix/users/mutableUsers.nix similarity index 100% rename from isla/users/mutableUsers.nix rename to s0meMiniPC-nix/users/mutableUsers.nix diff --git a/isla/users/users/hand7s.nix b/s0meMiniPC-nix/users/users/hand7s.nix similarity index 100% rename from isla/users/users/hand7s.nix rename to s0meMiniPC-nix/users/users/hand7s.nix diff --git a/isla/users/users/root.nix b/s0meMiniPC-nix/users/users/root.nix similarity index 100% rename from isla/users/users/root.nix rename to s0meMiniPC-nix/users/users/root.nix diff --git a/isla/virtualisation/docker.nix b/s0meMiniPC-nix/virtualisation/docker.nix similarity index 100% rename from isla/virtualisation/docker.nix rename to s0meMiniPC-nix/virtualisation/docker.nix diff --git a/ada/boot/initrd.nix b/s0mePC-nix/boot/initrd.nix similarity index 94% rename from ada/boot/initrd.nix rename to s0mePC-nix/boot/initrd.nix index 6924fac..98d1980 100644 --- a/ada/boot/initrd.nix +++ b/s0mePC-nix/boot/initrd.nix @@ -1,4 +1,4 @@ -_: { +{lib, ...}: { boot = { initrd = { availableKernelModules = [ @@ -14,9 +14,9 @@ _: { ]; supportedFilesystems = { - ntfs = true; vfat = true; btrfs = true; + zfs = lib.mkForce true; }; kernelModules = [ diff --git a/ada/boot/kernel.nix b/s0mePC-nix/boot/kernel.nix similarity index 92% rename from ada/boot/kernel.nix rename to s0mePC-nix/boot/kernel.nix index c3a04ac..19888ed 100644 --- a/ada/boot/kernel.nix +++ b/s0mePC-nix/boot/kernel.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { boot = { @@ -16,7 +17,7 @@ }; }; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-gcc; extraModulePackages = with config.boot.kernelPackages; [ zenpower v4l2loopback @@ -31,6 +32,7 @@ ]; kernelParams = [ + "video=DP-1:2560x1440@165" "amd_pstate=guided" "udev.log_priority=3" "quiet" @@ -43,7 +45,6 @@ "page_alloc.shuffle=1" "page_poison=1" "slab_nomerge" - "zswap.enabled=0" "kernel.watchdog=0" "oops=panic" @@ -67,7 +68,6 @@ "hfs" "hpfs" "jfs" - "zfs" "minix" "nilfs2" "ntfs" @@ -81,9 +81,9 @@ ]; supportedFilesystems = { - ntfs = true; vfat = true; btrfs = true; + zfs = lib.mkForce true; }; consoleLogLevel = 0; diff --git a/isla/boot/lanzaboote.nix b/s0mePC-nix/boot/lanzaboote.nix similarity index 100% rename from isla/boot/lanzaboote.nix rename to s0mePC-nix/boot/lanzaboote.nix diff --git a/viola/boot/loader/systemd-boot.nix b/s0mePC-nix/boot/loader/systemd-boot.nix similarity index 97% rename from viola/boot/loader/systemd-boot.nix rename to s0mePC-nix/boot/loader/systemd-boot.nix index d8ebe95..8e2989c 100644 --- a/viola/boot/loader/systemd-boot.nix +++ b/s0mePC-nix/boot/loader/systemd-boot.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { loader = { systemd-boot = { diff --git a/isla/boot/plymouth.nix b/s0mePC-nix/boot/plymouth.nix similarity index 100% rename from isla/boot/plymouth.nix rename to s0mePC-nix/boot/plymouth.nix diff --git a/ada/boot/tmp.nix b/s0mePC-nix/boot/tmp.nix similarity index 90% rename from ada/boot/tmp.nix rename to s0mePC-nix/boot/tmp.nix index 904e141..ac46b34 100644 --- a/ada/boot/tmp.nix +++ b/s0mePC-nix/boot/tmp.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { tmp = { useTmpfs = true; diff --git a/s0mePC-nix/boot/zfs.nix b/s0mePC-nix/boot/zfs.nix new file mode 100644 index 0000000..58db7ab --- /dev/null +++ b/s0mePC-nix/boot/zfs.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + boot = { + zfs = { + package = pkgs.zfs_cachyos; + allowHibernation = false; + removeLinuxDRM = false; + }; + }; +} diff --git a/viola/console/console.nix b/s0mePC-nix/console/console.nix similarity index 83% rename from viola/console/console.nix rename to s0mePC-nix/console/console.nix index e3a24c9..1e60d13 100644 --- a/viola/console/console.nix +++ b/s0mePC-nix/console/console.nix @@ -1,4 +1,4 @@ -_: { +{...}: { console = { useXkbConfig = true; }; diff --git a/s0mePC-nix/default.nix b/s0mePC-nix/default.nix new file mode 100644 index 0000000..e688038 --- /dev/null +++ b/s0mePC-nix/default.nix @@ -0,0 +1,111 @@ +{self, ...}: { + imports = [ + "${self}/s0mePC-nix/boot/initrd.nix" + "${self}/s0mePC-nix/boot/kernel.nix" + "${self}/s0mePC-nix/boot/lanzaboote.nix" + "${self}/s0mePC-nix/boot/plymouth.nix" + "${self}/s0mePC-nix/boot/tmp.nix" + "${self}/s0mePC-nix/boot/loader/systemd-boot.nix" + "${self}/s0mePC-nix/boot/zfs.nix" + + "${self}/s0mePC-nix/disko/disk.nix" + "${self}/s0mePC-nix/disko/lvm_vg.nix" + + "${self}/s0mePC-nix/console/console.nix" + + "${self}/s0mePC-nix/environment/systemPackages.nix" + "${self}/s0mePC-nix/environment/variables.nix" + + "${self}/s0mePC-nix/hardware/amdgpu.nix" + "${self}/s0mePC-nix/hardware/cpu.nix" + "${self}/s0mePC-nix/hardware/graphics.nix" + "${self}/s0mePC-nix/hardware/openrazer.nix" + "${self}/s0mePC-nix/hardware/qmk.nix" + "${self}/s0mePC-nix/hardware/zram.nix" + + "${self}/s0mePC-nix/home-manager/users.nix" + + "${self}/s0mePC-nix/i18n/locales.nix" + + "${self}/s0mePC-nix/networking/dhcp.nix" + "${self}/s0mePC-nix/networking/firewall.nix" + "${self}/s0mePC-nix/networking/hostname.nix" + "${self}/s0mePC-nix/networking/networkmanager.nix" + "${self}/s0mePC-nix/networking/wireguard.nix" + "${self}/s0mePC-nix/networking/nameservers.nix" + "${self}/s0mePC-nix/networking/hosts.nix" + "${self}/s0mePC-nix/networking/hostId.nix" + + "${self}/s0mePC-nix/nix/package.nix" + "${self}/s0mePC-nix/nix/settings/allowed-users.nix" + "${self}/s0mePC-nix/nix/settings/experimental-features.nix" + "${self}/s0mePC-nix/nix/settings/substituters.nix" + "${self}/s0mePC-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0mePC-nix/nix/settings/trusted-substituters.nix" + "${self}/s0mePC-nix/nix/settings/trusted-users.nix" + "${self}/s0mePC-nix/nix/settings/auto-optimise-store.nix" + + "${self}/s0mePC-nix/nixpkgs/config.nix" + "${self}/s0mePC-nix/nixpkgs/system.nix" + + "${self}/s0mePC-nix/programs/gamescope.nix" + "${self}/s0mePC-nix/programs/gamemode.nix" + "${self}/s0mePC-nix/programs/nh.nix" + "${self}/s0mePC-nix/programs/steam.nix" + "${self}/s0mePC-nix/programs/ssh.nix" + "${self}/s0mePC-nix/programs/yubikey-touch-detector.nix" + "${self}/s0mePC-nix/programs/nekoray.nix" + + "${self}/s0mePC-nix/security/polkit.nix" + "${self}/s0mePC-nix/security/rtkit.nix" + "${self}/s0mePC-nix/security/sudo.nix" + "${self}/s0mePC-nix/security/sudo-rs.nix" + "${self}/s0mePC-nix/security/pam/yubico.nix" + + "${self}/s0mePC-nix/services/greetd.nix" + "${self}/s0mePC-nix/services/libinput.nix" + "${self}/s0mePC-nix/services/openssh.nix" + "${self}/s0mePC-nix/services/pipewire.nix" + "${self}/s0mePC-nix/services/netbird.nix" + "${self}/s0mePC-nix/services/qmk.nix" + "${self}/s0mePC-nix/services/scx.nix" + "${self}/s0mePC-nix/services/xserver.nix" + "${self}/s0mePC-nix/services/zapret.nix" + "${self}/s0mePC-nix/services/zerotier.nix" + "${self}/s0mePC-nix/services/yggdrasil.nix" + "${self}/s0mePC-nix/services/sunshine.nix" + "${self}/s0mePC-nix/services/usbmuxd.nix" + "${self}/s0mePC-nix/services/irqbalance.nix" + "${self}/s0mePC-nix/services/yubikey-agent.nix" + "${self}/s0mePC-nix/services/resolved.nix" + + "${self}/s0mePC-nix/sops/defaults.nix" + "${self}/s0mePC-nix/sops/secrets.nix" + + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" + + "${self}/s0mePC-nix/system/name.nix" + "${self}/s0mePC-nix/system/stateVersion.nix" + + "${self}/s0mePC-nix/systemd/oomd.nix" + "${self}/s0mePC-nix/systemd/slices/system-slice.nix" + "${self}/s0mePC-nix/systemd/slices/user-slice.nix" + "${self}/s0mePC-nix/systemd/slices/root-slice.nix" + + "${self}/s0mePC-nix/time/timeZone.nix" + + "${self}/s0mePC-nix/users/users/hand7s.nix" + "${self}/s0mePC-nix/users/users/root.nix" + "${self}/s0mePC-nix/users/mutableUsers.nix" + + "${self}/s0mePC-nix/virtualisation/docker.nix" + + "${self}/s0mePC-nix/xdg/icons.nix" + "${self}/s0mePC-nix/xdg/mime.nix" + "${self}/s0mePC-nix/xdg/portal.nix" + ]; +} diff --git a/ada/disko/disk.nix b/s0mePC-nix/disko/disk.nix similarity index 99% rename from ada/disko/disk.nix rename to s0mePC-nix/disko/disk.nix index 3152264..63762ae 100644 --- a/ada/disko/disk.nix +++ b/s0mePC-nix/disko/disk.nix @@ -22,7 +22,6 @@ ]; }; }; - luks = { size = "100%"; content = { diff --git a/viola/disko/lvm_vg.nix b/s0mePC-nix/disko/lvm_vg.nix similarity index 100% rename from viola/disko/lvm_vg.nix rename to s0mePC-nix/disko/lvm_vg.nix diff --git a/ada/environment/systemPackages.nix b/s0mePC-nix/environment/systemPackages.nix similarity index 100% rename from ada/environment/systemPackages.nix rename to s0mePC-nix/environment/systemPackages.nix diff --git a/viola/environment/variables.nix b/s0mePC-nix/environment/variables.nix similarity index 100% rename from viola/environment/variables.nix rename to s0mePC-nix/environment/variables.nix diff --git a/ada/hardware/amdgpu.nix b/s0mePC-nix/hardware/amdgpu.nix similarity index 91% rename from ada/hardware/amdgpu.nix rename to s0mePC-nix/hardware/amdgpu.nix index 3dd1d56..dce6d88 100644 --- a/ada/hardware/amdgpu.nix +++ b/s0mePC-nix/hardware/amdgpu.nix @@ -1,4 +1,4 @@ -_: { +{...}: { hardware = { amdgpu = { initrd = { diff --git a/ada/hardware/cpu.nix b/s0mePC-nix/hardware/cpu.nix similarity index 65% rename from ada/hardware/cpu.nix rename to s0mePC-nix/hardware/cpu.nix index abd6460..dc5fd00 100644 --- a/ada/hardware/cpu.nix +++ b/s0mePC-nix/hardware/cpu.nix @@ -1,5 +1,6 @@ -_: { +{...}: { hardware = { + enableRedistributableFirmware = true; cpu = { amd = { updateMicrocode = true; diff --git a/ada/hardware/graphics.nix b/s0mePC-nix/hardware/graphics.nix similarity index 91% rename from ada/hardware/graphics.nix rename to s0mePC-nix/hardware/graphics.nix index 76c79bf..f81ccb7 100644 --- a/ada/hardware/graphics.nix +++ b/s0mePC-nix/hardware/graphics.nix @@ -1,4 +1,4 @@ -_: { +{...}: { hardware = { graphics = { enable = true; diff --git a/s0mePC-nix/hardware/openrazer.nix b/s0mePC-nix/hardware/openrazer.nix new file mode 100644 index 0000000..af74569 --- /dev/null +++ b/s0mePC-nix/hardware/openrazer.nix @@ -0,0 +1,15 @@ +{...}: { + hardware = { + openrazer = { + enable = false; + users = [ + "hand7s" + ]; + + batteryNotifier = { + enable = true; + percentage = 15; + }; + }; + }; +} diff --git a/isla/hardware/qmk.nix b/s0mePC-nix/hardware/qmk.nix similarity index 100% rename from isla/hardware/qmk.nix rename to s0mePC-nix/hardware/qmk.nix diff --git a/ada/hardware/zram.nix b/s0mePC-nix/hardware/zram.nix similarity index 92% rename from ada/hardware/zram.nix rename to s0mePC-nix/hardware/zram.nix index 0d77537..b973787 100644 --- a/ada/hardware/zram.nix +++ b/s0mePC-nix/hardware/zram.nix @@ -1,4 +1,4 @@ -_: { +{...}: { zramSwap = { enable = true; algorithm = "zstd"; diff --git a/s0mePC-nix/home-manager/users.nix b/s0mePC-nix/home-manager/users.nix new file mode 100644 index 0000000..be5338e --- /dev/null +++ b/s0mePC-nix/home-manager/users.nix @@ -0,0 +1,31 @@ +{ + inputs, + self, + ... +}: { + home-manager = { + users = { + hand7s = { + imports = [ + "${self}/hand7s/" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops + + inputs.nix-index-database.homeModules.nix-index + inputs.noctalia.homeModules.default + ]; + }; + }; + + backupFileExtension = "force"; + + extraSpecialArgs = { + inherit + inputs + self + ; + }; + }; +} diff --git a/ada/i18n/locales.nix b/s0mePC-nix/i18n/locales.nix similarity index 93% rename from ada/i18n/locales.nix rename to s0mePC-nix/i18n/locales.nix index f456740..09234a5 100644 --- a/ada/i18n/locales.nix +++ b/s0mePC-nix/i18n/locales.nix @@ -1,4 +1,4 @@ -_: { +{...}: { i18n = { defaultLocale = "en_US.UTF-8"; supportedLocales = [ diff --git a/isla/networking/dhcp.nix b/s0mePC-nix/networking/dhcp.nix similarity index 100% rename from isla/networking/dhcp.nix rename to s0mePC-nix/networking/dhcp.nix diff --git a/s0mePC-nix/networking/firewall.nix b/s0mePC-nix/networking/firewall.nix new file mode 100644 index 0000000..17f2917 --- /dev/null +++ b/s0mePC-nix/networking/firewall.nix @@ -0,0 +1,30 @@ +{...}: { + networking = { + firewall = { + allowPing = true; + enable = true; + checkReversePath = false; + + interfaces = { + eno1 = rec { + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + + allowedUDPPortRanges = allowedTCPPortRanges; + }; + + salt-hand7s-pc = rec { + allowedTCPPorts = [ + 6567 + ]; + + allowedUDPPorts = allowedTCPPorts; + }; + }; + }; + }; +} diff --git a/wanda/networking/hostId.nix b/s0mePC-nix/networking/hostId.nix similarity index 84% rename from wanda/networking/hostId.nix rename to s0mePC-nix/networking/hostId.nix index 585868c..a771b6b 100644 --- a/wanda/networking/hostId.nix +++ b/s0mePC-nix/networking/hostId.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { hostId = "5c79d468"; }; diff --git a/s0mePC-nix/networking/hostname.nix b/s0mePC-nix/networking/hostname.nix new file mode 100644 index 0000000..95bc424 --- /dev/null +++ b/s0mePC-nix/networking/hostname.nix @@ -0,0 +1,5 @@ +{...}: { + networking = { + hostName = "s0mePC-nix"; + }; +} diff --git a/viola/networking/hosts.nix b/s0mePC-nix/networking/hosts.nix similarity index 86% rename from viola/networking/hosts.nix rename to s0mePC-nix/networking/hosts.nix index e42e2b1..04747e5 100644 --- a/viola/networking/hosts.nix +++ b/s0mePC-nix/networking/hosts.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { hosts = { # nope diff --git a/viola/networking/nameservers.nix b/s0mePC-nix/networking/nameservers.nix similarity index 98% rename from viola/networking/nameservers.nix rename to s0mePC-nix/networking/nameservers.nix index 31726b9..a4d22c1 100644 --- a/viola/networking/nameservers.nix +++ b/s0mePC-nix/networking/nameservers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { nameservers = [ # cf dns diff --git a/ada/networking/networkmanager.nix b/s0mePC-nix/networking/networkmanager.nix similarity index 91% rename from ada/networking/networkmanager.nix rename to s0mePC-nix/networking/networkmanager.nix index 474d212..3d66f30 100644 --- a/ada/networking/networkmanager.nix +++ b/s0mePC-nix/networking/networkmanager.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { networkmanager = { enable = false; diff --git a/viola/networking/timeServers.nix b/s0mePC-nix/networking/timeServers.nix similarity index 94% rename from viola/networking/timeServers.nix rename to s0mePC-nix/networking/timeServers.nix index 9289ea6..88e14c4 100644 --- a/viola/networking/timeServers.nix +++ b/s0mePC-nix/networking/timeServers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { timeServers = [ "0.nixos.pool.ntp.org" diff --git a/kyra/networking/wireguard.nix b/s0mePC-nix/networking/wireguard.nix similarity index 88% rename from kyra/networking/wireguard.nix rename to s0mePC-nix/networking/wireguard.nix index bd2336c..2ee5c02 100644 --- a/kyra/networking/wireguard.nix +++ b/s0mePC-nix/networking/wireguard.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { wireguard = { enable = true; diff --git a/isla/nix/package.nix b/s0mePC-nix/nix/package.nix similarity index 100% rename from isla/nix/package.nix rename to s0mePC-nix/nix/package.nix diff --git a/ada/nix/settings/allowed-users.nix b/s0mePC-nix/nix/settings/allowed-users.nix similarity index 92% rename from ada/nix/settings/allowed-users.nix rename to s0mePC-nix/nix/settings/allowed-users.nix index 0239519..d483d0c 100644 --- a/ada/nix/settings/allowed-users.nix +++ b/s0mePC-nix/nix/settings/allowed-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { sandbox = true; diff --git a/kyra/nix/settings/auto-optimise-store.nix b/s0mePC-nix/nix/settings/auto-optimise-store.nix similarity index 89% rename from kyra/nix/settings/auto-optimise-store.nix rename to s0mePC-nix/nix/settings/auto-optimise-store.nix index cb7a22a..14f13c5 100644 --- a/kyra/nix/settings/auto-optimise-store.nix +++ b/s0mePC-nix/nix/settings/auto-optimise-store.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { auto-optimise-store = true; diff --git a/kyra/nix/settings/experimental-features.nix b/s0mePC-nix/nix/settings/experimental-features.nix similarity index 93% rename from kyra/nix/settings/experimental-features.nix rename to s0mePC-nix/nix/settings/experimental-features.nix index 9c45bc4..7ce7e89 100644 --- a/kyra/nix/settings/experimental-features.nix +++ b/s0mePC-nix/nix/settings/experimental-features.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { experimental-features = [ diff --git a/wanda/nix/settings/substituters.nix b/s0mePC-nix/nix/settings/substituters.nix similarity index 82% rename from wanda/nix/settings/substituters.nix rename to s0mePC-nix/nix/settings/substituters.nix index da0035f..762ec5c 100644 --- a/wanda/nix/settings/substituters.nix +++ b/s0mePC-nix/nix/settings/substituters.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { substituters = [ @@ -9,10 +9,10 @@ _: { # cachix "https://nix-community.cachix.org/" "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" "https://hyprland.cachix.org" "https://chaotic-nyx.cachix.org/" - # nix-community - "https://hydra.nix-community.org/" + "https://colmena.cachix.org" ]; }; }; diff --git a/ada/nix/settings/trusted-public-keys.nix b/s0mePC-nix/nix/settings/trusted-public-keys.nix similarity index 98% rename from ada/nix/settings/trusted-public-keys.nix rename to s0mePC-nix/nix/settings/trusted-public-keys.nix index 4a128cb..e8710cb 100644 --- a/ada/nix/settings/trusted-public-keys.nix +++ b/s0mePC-nix/nix/settings/trusted-public-keys.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-public-keys = [ diff --git a/ada/nix/settings/trusted-substituters.nix b/s0mePC-nix/nix/settings/trusted-substituters.nix similarity index 90% rename from ada/nix/settings/trusted-substituters.nix rename to s0mePC-nix/nix/settings/trusted-substituters.nix index b5d0387..a5927a2 100644 --- a/ada/nix/settings/trusted-substituters.nix +++ b/s0mePC-nix/nix/settings/trusted-substituters.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-substituters = [ @@ -13,6 +13,7 @@ _: { "https://ags.cachix.org" "https://hyprland.cachix.org" "https://chaotic-nyx.cachix.org/" + "https://colmena.cachix.org" ]; }; }; diff --git a/viola/nix/settings/trusted-users.nix b/s0mePC-nix/nix/settings/trusted-users.nix similarity index 91% rename from viola/nix/settings/trusted-users.nix rename to s0mePC-nix/nix/settings/trusted-users.nix index 4eee825..e4a9dae 100644 --- a/viola/nix/settings/trusted-users.nix +++ b/s0mePC-nix/nix/settings/trusted-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-users = [ diff --git a/ada/nixpkgs/config.nix b/s0mePC-nix/nixpkgs/config.nix similarity index 91% rename from ada/nixpkgs/config.nix rename to s0mePC-nix/nixpkgs/config.nix index b93e4ef..27b79b0 100644 --- a/ada/nixpkgs/config.nix +++ b/s0mePC-nix/nixpkgs/config.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { config = { allowUnfree = true; diff --git a/ada/nixpkgs/overlays.nix b/s0mePC-nix/nixpkgs/overlays.nix similarity index 83% rename from ada/nixpkgs/overlays.nix rename to s0mePC-nix/nixpkgs/overlays.nix index 8db0844..2881eba 100644 --- a/ada/nixpkgs/overlays.nix +++ b/s0mePC-nix/nixpkgs/overlays.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { overlays = [ ]; diff --git a/wanda/nixpkgs/system.nix b/s0mePC-nix/nixpkgs/system.nix similarity index 90% rename from wanda/nixpkgs/system.nix rename to s0mePC-nix/nixpkgs/system.nix index 3cbe59a..63fda3b 100644 --- a/wanda/nixpkgs/system.nix +++ b/s0mePC-nix/nixpkgs/system.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { system = "x86_64-linux"; hostPlatform = "x86_64-linux"; diff --git a/ada/programs/gamemode.nix b/s0mePC-nix/programs/gamemode.nix similarity index 91% rename from ada/programs/gamemode.nix rename to s0mePC-nix/programs/gamemode.nix index 4d197e1..3a6acb9 100644 --- a/ada/programs/gamemode.nix +++ b/s0mePC-nix/programs/gamemode.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { gamemode = { enable = true; diff --git a/ada/programs/gamescope.nix b/s0mePC-nix/programs/gamescope.nix similarity index 76% rename from ada/programs/gamescope.nix rename to s0mePC-nix/programs/gamescope.nix index 44be34d..7e6c94c 100644 --- a/ada/programs/gamescope.nix +++ b/s0mePC-nix/programs/gamescope.nix @@ -2,7 +2,7 @@ programs = { gamescope = { enable = true; - package = pkgs.gamescope; + package = pkgs.gamescope_git; args = [ "-e" ]; diff --git a/ada/programs/nekoray.nix b/s0mePC-nix/programs/nekoray.nix similarity index 83% rename from ada/programs/nekoray.nix rename to s0mePC-nix/programs/nekoray.nix index 6eb2421..b5cfb36 100644 --- a/ada/programs/nekoray.nix +++ b/s0mePC-nix/programs/nekoray.nix @@ -1,6 +1,6 @@ -_: { +{...}: { programs = { - throne = { + nekoray = { enable = true; tunMode = { enable = true; diff --git a/viola/programs/nh.nix b/s0mePC-nix/programs/nh.nix similarity index 95% rename from viola/programs/nh.nix rename to s0mePC-nix/programs/nh.nix index 6d9937d..f43fb06 100644 --- a/viola/programs/nh.nix +++ b/s0mePC-nix/programs/nh.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { nh = { enable = true; diff --git a/ada/programs/ssh.nix b/s0mePC-nix/programs/ssh.nix similarity index 91% rename from ada/programs/ssh.nix rename to s0mePC-nix/programs/ssh.nix index 017f4c9..0f8bd7b 100644 --- a/ada/programs/ssh.nix +++ b/s0mePC-nix/programs/ssh.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { ssh = { startAgent = true; diff --git a/ada/programs/steam.nix b/s0mePC-nix/programs/steam.nix similarity index 100% rename from ada/programs/steam.nix rename to s0mePC-nix/programs/steam.nix diff --git a/isla/programs/yubikey-touch-detector.nix b/s0mePC-nix/programs/yubikey-touch-detector.nix similarity index 100% rename from isla/programs/yubikey-touch-detector.nix rename to s0mePC-nix/programs/yubikey-touch-detector.nix diff --git a/wanda/security/pam/yubico.nix b/s0mePC-nix/security/pam/yubico.nix similarity index 96% rename from wanda/security/pam/yubico.nix rename to s0mePC-nix/security/pam/yubico.nix index cd8a4a1..a17999d 100644 --- a/wanda/security/pam/yubico.nix +++ b/s0mePC-nix/security/pam/yubico.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { pam = { yubico = { diff --git a/wanda/security/polkit.nix b/s0mePC-nix/security/polkit.nix similarity index 93% rename from wanda/security/polkit.nix rename to s0mePC-nix/security/polkit.nix index 77e04d1..7604e82 100644 --- a/wanda/security/polkit.nix +++ b/s0mePC-nix/security/polkit.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { polkit = { enable = true; diff --git a/viola/security/rtkit.nix b/s0mePC-nix/security/rtkit.nix similarity index 87% rename from viola/security/rtkit.nix rename to s0mePC-nix/security/rtkit.nix index dd40f89..d3604df 100644 --- a/viola/security/rtkit.nix +++ b/s0mePC-nix/security/rtkit.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { rtkit = { enable = true; diff --git a/viola/security/sudo-rs.nix b/s0mePC-nix/security/sudo-rs.nix similarity index 93% rename from viola/security/sudo-rs.nix rename to s0mePC-nix/security/sudo-rs.nix index 4f270c9..772460d 100644 --- a/viola/security/sudo-rs.nix +++ b/s0mePC-nix/security/sudo-rs.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { sudo-rs = { enable = true; diff --git a/isla/security/sudo.nix b/s0mePC-nix/security/sudo.nix similarity index 100% rename from isla/security/sudo.nix rename to s0mePC-nix/security/sudo.nix diff --git a/ada/services/greetd.nix b/s0mePC-nix/services/greetd.nix similarity index 81% rename from ada/services/greetd.nix rename to s0mePC-nix/services/greetd.nix index 83d2431..812845d 100644 --- a/ada/services/greetd.nix +++ b/s0mePC-nix/services/greetd.nix @@ -9,7 +9,7 @@ restart = false; settings = { default_session = { - command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe' pkgs.hyprland "start-hyprland"} --greet-align center"; + command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe pkgs.hyprland} --greet-align center"; user = "greeter"; }; }; diff --git a/ada/services/irqbalance.nix b/s0mePC-nix/services/irqbalance.nix similarity index 88% rename from ada/services/irqbalance.nix rename to s0mePC-nix/services/irqbalance.nix index ee8472e..2b3b1dd 100644 --- a/ada/services/irqbalance.nix +++ b/s0mePC-nix/services/irqbalance.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { irqbalance = { enable = true; diff --git a/viola/services/libinput.nix b/s0mePC-nix/services/libinput.nix similarity index 97% rename from viola/services/libinput.nix rename to s0mePC-nix/services/libinput.nix index 23c2953..d859d7f 100644 --- a/viola/services/libinput.nix +++ b/s0mePC-nix/services/libinput.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { libinput = { enable = true; diff --git a/kyra/services/netbird.nix b/s0mePC-nix/services/netbird.nix similarity index 100% rename from kyra/services/netbird.nix rename to s0mePC-nix/services/netbird.nix diff --git a/wanda/services/openssh.nix b/s0mePC-nix/services/openssh.nix similarity index 96% rename from wanda/services/openssh.nix rename to s0mePC-nix/services/openssh.nix index 989beca..eecdb2e 100644 --- a/wanda/services/openssh.nix +++ b/s0mePC-nix/services/openssh.nix @@ -5,7 +5,7 @@ allowSFTP = true; openFirewall = true; ports = [ - 48630 + 45734 ]; settings = { diff --git a/viola/services/pipewire.nix b/s0mePC-nix/services/pipewire.nix similarity index 99% rename from viola/services/pipewire.nix rename to s0mePC-nix/services/pipewire.nix index 37c7c5f..c4bad1e 100644 --- a/viola/services/pipewire.nix +++ b/s0mePC-nix/services/pipewire.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { pipewire = { enable = true; diff --git a/ada/services/qmk.nix b/s0mePC-nix/services/qmk.nix similarity index 100% rename from ada/services/qmk.nix rename to s0mePC-nix/services/qmk.nix diff --git a/wanda/services/resolved.nix b/s0mePC-nix/services/resolved.nix similarity index 98% rename from wanda/services/resolved.nix rename to s0mePC-nix/services/resolved.nix index 8c268e8..90df2ad 100644 --- a/wanda/services/resolved.nix +++ b/s0mePC-nix/services/resolved.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { resolved = { enable = true; diff --git a/wanda/services/scx.nix b/s0mePC-nix/services/scx.nix similarity index 67% rename from wanda/services/scx.nix rename to s0mePC-nix/services/scx.nix index 2ab435e..2500bba 100644 --- a/wanda/services/scx.nix +++ b/s0mePC-nix/services/scx.nix @@ -1,7 +1,8 @@ -_: { +{...}: { services = { scx = { enable = true; + # package = pkgs.scx_git.full; scheduler = "scx_cosmos"; }; }; diff --git a/wanda/services/sunshine.nix b/s0mePC-nix/services/sunshine.nix similarity index 94% rename from wanda/services/sunshine.nix rename to s0mePC-nix/services/sunshine.nix index 25a9a56..ae9299a 100644 --- a/wanda/services/sunshine.nix +++ b/s0mePC-nix/services/sunshine.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { sunshine = { enable = true; diff --git a/isla/services/usbmuxd.nix b/s0mePC-nix/services/usbmuxd.nix similarity index 100% rename from isla/services/usbmuxd.nix rename to s0mePC-nix/services/usbmuxd.nix diff --git a/ada/services/xserver.nix b/s0mePC-nix/services/xserver.nix similarity index 100% rename from ada/services/xserver.nix rename to s0mePC-nix/services/xserver.nix diff --git a/s0mePC-nix/services/yggdrasil.nix b/s0mePC-nix/services/yggdrasil.nix new file mode 100644 index 0000000..c7fc99d --- /dev/null +++ b/s0mePC-nix/services/yggdrasil.nix @@ -0,0 +1,64 @@ +{...}: { + services = { + yggdrasil = { + enable = true; + persistentKeys = false; + settings = { + PrivateKey = "${yggKeyPC}"; + + Peers = [ + # Germany :Erm: + "tcp://s-fra-0.sergeysedoy97.ru:65533" + "tls://s-fra-0.sergeysedoy97.ru:65534" + "tcp://x-fra-0.sergeysedoy97.ru:65533" + "tls://x-fra-0.sergeysedoy97.ru:65534" + "quic://x-fra-0.sergeysedoy97.ru:65535" + "tls://helium.avevad.com:13378" + "tcp://bode.theender.net:42069" + "tls://bode.theender.net:42169?key=f91b909f43829f8b20732b3bcf80cbc4bb078dd47b41638379a078e35984c9a4" + + # Russia + "tcp://s-mow-0.sergeysedoy97.ru:65533" + "tls://s-mow-0.sergeysedoy97.ru:65534" + "tcp://x-mow-0.sergeysedoy97.ru:65533" + "tls://x-mow-0.sergeysedoy97.ru:65534" + "quic://x-mow-0.sergeysedoy97.ru:65535" + "tcp://s-mow-1.sergeysedoy97.ru:65533" + "tls://s-mow-1.sergeysedoy97.ru:65534" + "tcp://x-mow-1.sergeysedoy97.ru:65533" + "tls://x-mow-1.sergeysedoy97.ru:65534" + "quic://x-mow-1.sergeysedoy97.ru:65535" + "quic://kursk.cleverfox.org:15015" + "tls://kursk.cleverfox.org:15015" + "ws://kursk.cleverfox.org:15016" + "tcp://kzn1.neonxp.ru:7991" + "tls://kzn1.neonxp.ru:7992" + "ws://kzn1.neonxp.ru:7993" + "quic://kzn1.neonxp.ru:7994" + ]; + + Listen = [ + # + ]; + + MulticastInterfaces = [ + { + Regex = ".*"; + Beacon = true; + Listen = false; + Password = ""; + } + ]; + + AllowedPublicKeys = [ + # + ]; + + IfName = "auto"; + + IfMTU = 65535; + NodeInfoPrivacy = false; + }; + }; + }; +} diff --git a/ada/services/yubikey-agent.nix b/s0mePC-nix/services/yubikey-agent.nix similarity index 100% rename from ada/services/yubikey-agent.nix rename to s0mePC-nix/services/yubikey-agent.nix diff --git a/s0mePC-nix/services/zapret.nix b/s0mePC-nix/services/zapret.nix new file mode 100644 index 0000000..ad671e1 --- /dev/null +++ b/s0mePC-nix/services/zapret.nix @@ -0,0 +1,145 @@ +{...}: { + services = { + zapret = { + enable = true; + configureFirewall = true; + qnum = 350; + params = [ + "--wssize 1:6" + + "--filter-tcp=80" + "--dpi-desync=multisplit" + "--dpi-desync-split-pos=10" + "--dpi-desync-repeats=6" + "--new" + + "--filter-tcp=443" + "--dpi-desync=multidisorder" + "--dpi-desync-split-pos=1,midsld" + "--new" + + "--filter-tcp=443" + "--dpi-desync=syndata" + "--dpi-desync-fake-syndata=0x00000000" + "--dpi-desync-ttl=10" + "--new" + + "--filter-udp=443" + "--dpi-desync=fake" + "--dpi-desync-repeats=6" + "--dpi-desync-fake-quic=0x00000000" + "--new" + + "--filter-udp=443" + "--dpi-desync=fake,udplen" + "--dpi-desync-udplen-increment=5" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-cutoff=n3" + "--dpi-desync-repeats=2" + "--new" + + "--filter-tcp=443" + "--dpi-desync=split" + "--dpi-desync-fooling=md5sig,badseq" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync-repeats=10" + "--new" + + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + + "--dpi-desync-autottl" + "--new" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + "--dpi-desync-autottl" + "--new" + + "--filter-tcp=80" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-autottl" + "--new" + + "--filter-tcp=80" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync=fake,split2" + "--dpi-desync-repeats=6" + "--dpi-desync-fooling=md5sig" + "--new" + ]; + + whitelist = [ + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "youtubeembeddedplayer.googleapis.com" + "ytimg.l.google.com" + "ytimg.com" + "jnn-pa.googleapis.com" + "youtube-nocookie.com" + "youtube-ui.l.google.com" + "yt-video-upload.l.google.com" + "wide-youtube.l.google.com" + "youtubekids.com" + "ggpht.com" + "music.youtube.com" + "test.googlevideo.com" + "discord.com" + "gateway.discord.gg" + "cdn.discordapp.com" + "discordapp.net" + "discordapp.com" + "discord.gg" + "media.discordapp.net" + "images-ext-1.discordapp.net" + "discord.app" + "discord.media" + "discordcdn.com" + "discord.dev" + "discord.new" + "discord.gift" + "discordstatus.com" + "dis.gd" + "discord.co" + "discord-attachments-uploads-prd.storage.googleapis.com" + "7tv.app" + "7tv.io" + "10tv.app" + "x.com" + "t.co" + "ads-twitter.com" + "twimg.com" + "twitter.com" + "pscp.tv" + "twtrdns.net" + "twttr.com" + "periscope.tv" + "tweetdeck.com" + "twitpic.com" + "twitter.co" + "twitterinc.com" + "twitteroauth.com" + "twitterstat.us" + ]; + }; + }; +} diff --git a/isla/services/zerotier.nix b/s0mePC-nix/services/zerotier.nix similarity index 100% rename from isla/services/zerotier.nix rename to s0mePC-nix/services/zerotier.nix diff --git a/isla/system/name.nix b/s0mePC-nix/system/name.nix similarity index 100% rename from isla/system/name.nix rename to s0mePC-nix/system/name.nix diff --git a/isla/system/stateVersion.nix b/s0mePC-nix/system/stateVersion.nix similarity index 100% rename from isla/system/stateVersion.nix rename to s0mePC-nix/system/stateVersion.nix diff --git a/ada/systemd/oomd.nix b/s0mePC-nix/systemd/oomd.nix similarity index 94% rename from ada/systemd/oomd.nix rename to s0mePC-nix/systemd/oomd.nix index bb9a200..cbd28f2 100644 --- a/ada/systemd/oomd.nix +++ b/s0mePC-nix/systemd/oomd.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { oomd = { enable = true; diff --git a/viola/systemd/slices/root-slice.nix b/s0mePC-nix/systemd/slices/root-slice.nix similarity index 96% rename from viola/systemd/slices/root-slice.nix rename to s0mePC-nix/systemd/slices/root-slice.nix index 6a386e9..118ca0b 100644 --- a/viola/systemd/slices/root-slice.nix +++ b/s0mePC-nix/systemd/slices/root-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { root = { diff --git a/wanda/systemd/slices/system-slice.nix b/s0mePC-nix/systemd/slices/system-slice.nix similarity index 96% rename from wanda/systemd/slices/system-slice.nix rename to s0mePC-nix/systemd/slices/system-slice.nix index 4de4bba..148f19b 100644 --- a/wanda/systemd/slices/system-slice.nix +++ b/s0mePC-nix/systemd/slices/system-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { system = { diff --git a/viola/systemd/slices/user-slice.nix b/s0mePC-nix/systemd/slices/user-slice.nix similarity index 96% rename from viola/systemd/slices/user-slice.nix rename to s0mePC-nix/systemd/slices/user-slice.nix index 311e668..21d74d8 100644 --- a/viola/systemd/slices/user-slice.nix +++ b/s0mePC-nix/systemd/slices/user-slice.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { slices = { user = { diff --git a/ada/time/timeZone.nix b/s0mePC-nix/time/timeZone.nix similarity index 90% rename from ada/time/timeZone.nix rename to s0mePC-nix/time/timeZone.nix index cef1656..57bca35 100644 --- a/ada/time/timeZone.nix +++ b/s0mePC-nix/time/timeZone.nix @@ -1,4 +1,4 @@ -_: { +{...}: { time = { timeZone = "Europe/Moscow"; hardwareClockInLocalTime = true; diff --git a/ada/users/mutableUsers.nix b/s0mePC-nix/users/mutableUsers.nix similarity index 83% rename from ada/users/mutableUsers.nix rename to s0mePC-nix/users/mutableUsers.nix index 9bb56d0..54415f1 100644 --- a/ada/users/mutableUsers.nix +++ b/s0mePC-nix/users/mutableUsers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { users = { mutableUsers = false; }; diff --git a/viola/users/users/hand7s.nix b/s0mePC-nix/users/users/hand7s.nix similarity index 86% rename from viola/users/users/hand7s.nix rename to s0mePC-nix/users/users/hand7s.nix index 141b5a3..8c0df47 100644 --- a/viola/users/users/hand7s.nix +++ b/s0mePC-nix/users/users/hand7s.nix @@ -1,13 +1,14 @@ -_: { +{...}: { users = { users = { - "hand7s" = { + hand7s = { description = "me"; isSystemUser = false; isNormalUser = true; initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; extraGroups = [ "wheel" + "networkmanager" "docker" ]; }; diff --git a/wanda/users/users/root.nix b/s0mePC-nix/users/users/root.nix similarity index 88% rename from wanda/users/users/root.nix rename to s0mePC-nix/users/users/root.nix index faa89b7..595a6f6 100644 --- a/wanda/users/users/root.nix +++ b/s0mePC-nix/users/users/root.nix @@ -1,7 +1,7 @@ -_: { +{...}: { users = { users = { - "root" = { + root = { initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; }; }; diff --git a/wanda/virtualisation/docker.nix b/s0mePC-nix/virtualisation/docker.nix similarity index 93% rename from wanda/virtualisation/docker.nix rename to s0mePC-nix/virtualisation/docker.nix index 805ac30..1edae88 100644 --- a/wanda/virtualisation/docker.nix +++ b/s0mePC-nix/virtualisation/docker.nix @@ -1,4 +1,4 @@ -_: { +{...}: { virtualisation = { docker = { enable = true; diff --git a/isla/xdg/icons.nix b/s0mePC-nix/xdg/icons.nix similarity index 100% rename from isla/xdg/icons.nix rename to s0mePC-nix/xdg/icons.nix diff --git a/isla/xdg/mime.nix b/s0mePC-nix/xdg/mime.nix similarity index 100% rename from isla/xdg/mime.nix rename to s0mePC-nix/xdg/mime.nix diff --git a/ada/xdg/portal.nix b/s0mePC-nix/xdg/portal.nix similarity index 66% rename from ada/xdg/portal.nix rename to s0mePC-nix/xdg/portal.nix index ff26e0a..da6b70a 100644 --- a/ada/xdg/portal.nix +++ b/s0mePC-nix/xdg/portal.nix @@ -5,18 +5,12 @@ config = { common = { - "org.freedesktop.impl.portal.FileChooser" = "termfilechooser"; - default = [ "gtk" ]; }; hyprland = { - "org.freedesktop.impl.portal.FileChooser" = [ - "termfilechooser" - ]; - preferred = [ "gtk" "hyprland" @@ -28,7 +22,6 @@ xdg-desktop-portal xdg-desktop-portal-gtk xdg-desktop-portal-hyprland - xdg-desktop-portal-termfilechooser ]; }; }; diff --git a/isla/boot/initrd.nix b/s0melapt0p-nix/boot/initrd.nix similarity index 100% rename from isla/boot/initrd.nix rename to s0melapt0p-nix/boot/initrd.nix diff --git a/isla/boot/kernel.nix b/s0melapt0p-nix/boot/kernel.nix similarity index 100% rename from isla/boot/kernel.nix rename to s0melapt0p-nix/boot/kernel.nix diff --git a/viola/boot/lanzaboote.nix b/s0melapt0p-nix/boot/lanzaboote.nix similarity index 95% rename from viola/boot/lanzaboote.nix rename to s0melapt0p-nix/boot/lanzaboote.nix index 8036b8a..08d07df 100644 --- a/viola/boot/lanzaboote.nix +++ b/s0melapt0p-nix/boot/lanzaboote.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { lanzaboote = { enable = true; diff --git a/isla/boot/loader/systemd-boot.nix b/s0melapt0p-nix/boot/loader/systemd-boot.nix similarity index 100% rename from isla/boot/loader/systemd-boot.nix rename to s0melapt0p-nix/boot/loader/systemd-boot.nix diff --git a/viola/boot/plymouth.nix b/s0melapt0p-nix/boot/plymouth.nix similarity index 100% rename from viola/boot/plymouth.nix rename to s0melapt0p-nix/boot/plymouth.nix diff --git a/viola/boot/tmp.nix b/s0melapt0p-nix/boot/tmp.nix similarity index 90% rename from viola/boot/tmp.nix rename to s0melapt0p-nix/boot/tmp.nix index 904e141..ac46b34 100644 --- a/viola/boot/tmp.nix +++ b/s0melapt0p-nix/boot/tmp.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { tmp = { useTmpfs = true; diff --git a/ada/console/console.nix b/s0melapt0p-nix/console/console.nix similarity index 83% rename from ada/console/console.nix rename to s0melapt0p-nix/console/console.nix index e3a24c9..1e60d13 100644 --- a/ada/console/console.nix +++ b/s0melapt0p-nix/console/console.nix @@ -1,4 +1,4 @@ -_: { +{...}: { console = { useXkbConfig = true; }; diff --git a/s0melapt0p-nix/default.nix b/s0melapt0p-nix/default.nix new file mode 100644 index 0000000..f00904e --- /dev/null +++ b/s0melapt0p-nix/default.nix @@ -0,0 +1,99 @@ +{self, ...}: { + imports = [ + "${self}/s0melapt0p-nix/disko/disk.nix" + "${self}/s0melapt0p-nix/disko/lvm_vg.nix" + + "${self}/s0melapt0p-nix/boot/loader/system-boot.nix" + "${self}/s0melapt0p-nix/boot/lanzaboote.nix" + "${self}/s0melapt0p-nix/boot/initrd.nix" + "${self}/s0melapt0p-nix/boot/kernel.nix" + "${self}/s0melapt0p-nix/boot/plymouth.nix" + "${self}/s0melapt0p-nix/boot/tmp.nix" + + "${self}/s0melapt0p-nix/console/console.nix" + + "${self}/s0melapt0p-nix/environment/systemPackages.nix" + "${self}/s0melapt0p-nix/environment/variables.nix" + + "${self}/s0melapt0p-nix/hardware/cpu.nix" + "${self}/s0melapt0p-nix/hardware/graphics.nix" + "${self}/s0melapt0p-nix/hardware/qmk.nix" + "${self}/s0melapt0p-nix/hardware/zram.nix" + + "${self}/s0melapt0p-nix/home-manager/users.nix" + + "${self}/s0melapt0p-nix/i18n/locales.nix" + + "${self}/s0melapt0p-nix/networking/dhcp.nix" + "${self}/s0melapt0p-nix/networking/firewall.nix" + "${self}/s0melapt0p-nix/networking/hostname.nix" + "${self}/s0melapt0p-nix/networking/networkmanager.nix" + "${self}/s0melapt0p-nix/networking/wireguard.nix" + "${self}/s0melapt0p-nix/networking/nameservers.nix" + "${self}/s0melapt0p-nix/networking/hosts.nix" + "${self}/s0melapt0p-nix/networking/hostId.nix" + + "${self}/s0melapt0p-nix/nix/package.nix" + "${self}/s0melapt0p-nix/nix/settings/allowed-users.nix" + "${self}/s0melapt0p-nix/nix/settings/experimental-features.nix" + "${self}/s0melapt0p-nix/nix/settings/substituters.nix" + "${self}/s0melapt0p-nix/nix/settings/trusted-public-keys.nix" + "${self}/s0melapt0p-nix/nix/settings/trusted-users.nix" + + "${self}/s0melapt0p-nix/nixpkgs/config.nix" + "${self}/s0melapt0p-nix/nixpkgs/system.nix" + + "${self}/s0melapt0p-nix/programs/gamemode.nix" + "${self}/s0melapt0p-nix/programs/nh.nix" + "${self}/s0melapt0p-nix/programs/steam.nix" + "${self}/s0melapt0p-nix/programs/ssh.nix" + "${self}/s0melapt0p-nix/programs/yubikey-touch-detector.nix" + + "${self}/s0melapt0p-nix/security/polkit.nix" + "${self}/s0melapt0p-nix/security/rtkit.nix" + "${self}/s0melapt0p-nix/security/sudo.nix" + "${self}/s0melapt0p-nix/security/sudo-rs.nix" + "${self}/s0melapt0p-nix/security/pam/services.nix" + + "${self}/s0melapt0p-nix/services/fprintd.nix" + "${self}/s0melapt0p-nix/services/greetd.nix" + "${self}/s0melapt0p-nix/services/libinput.nix" + "${self}/s0melapt0p-nix/services/openssh.nix" + "${self}/s0melapt0p-nix/services/pipewire.nix" + "${self}/s0melapt0p-nix/services/qmk.nix" + "${self}/s0melapt0p-nix/services/thinkfan.nix" + "${self}/s0melapt0p-nix/services/usbmuxd.nix" + "${self}/s0melapt0p-nix/services/xserver.nix" + "${self}/s0melapt0p-nix/services/zapret.nix" + "${self}/s0melapt0p-nix/services/zerotier.nix" + "${self}/s0melapt0p-nix/services/yggdrasil.nix" + "${self}/s0melapt0p-nix/services/netbird.nix" + "${self}/s0melapt0p-nix/services/yubikey-agent.nix" + + "${self}/s0melapt0p-nix/sops/defaults.nix" + "${self}/s0melapt0p-nix/sops/secrets.nix" + + "${self}/hand7s/stylix/base16Scheme.nix" + "${self}/hand7s/stylix/cursor.nix" + "${self}/hand7s/stylix/defaults.nix" + "${self}/hand7s/stylix/fonts.nix" + "${self}/hand7s/stylix/image.nix" + + "${self}/s0melapt0p-nix/system/name.nix" + "${self}/s0melapt0p-nix/system/stateVersion.nix" + + "${self}/s0melapt0p-nix/systemd/oomd.nix" + + "${self}/s0melapt0p-nix/time/timeZone.nix" + + "${self}/s0melapt0p-nix/users/users/hand7s.nix" + "${self}/s0melapt0p-nix/users/users/root.nix" + "${self}/s0melapt0p-nix/users/mutableUsers.nix" + + "${self}/s0melapt0p-nix/virtualisation/docker.nix" + + "${self}/s0melapt0p-nix/xdg/icons.nix" + "${self}/s0melapt0p-nix/xdg/mime.nix" + "${self}/s0melapt0p-nix/xdg/portal.nix" + ]; +} diff --git a/isla/disko/disk.nix b/s0melapt0p-nix/disko/disk.nix similarity index 100% rename from isla/disko/disk.nix rename to s0melapt0p-nix/disko/disk.nix diff --git a/isla/disko/lvm_vg.nix b/s0melapt0p-nix/disko/lvm_vg.nix similarity index 100% rename from isla/disko/lvm_vg.nix rename to s0melapt0p-nix/disko/lvm_vg.nix diff --git a/isla/environment/systemPackages.nix b/s0melapt0p-nix/environment/systemPackages.nix similarity index 100% rename from isla/environment/systemPackages.nix rename to s0melapt0p-nix/environment/systemPackages.nix diff --git a/isla/environment/variables.nix b/s0melapt0p-nix/environment/variables.nix similarity index 100% rename from isla/environment/variables.nix rename to s0melapt0p-nix/environment/variables.nix diff --git a/viola/hardware/cpu.nix b/s0melapt0p-nix/hardware/cpu.nix similarity index 93% rename from viola/hardware/cpu.nix rename to s0melapt0p-nix/hardware/cpu.nix index 441946f..e5746c6 100644 --- a/viola/hardware/cpu.nix +++ b/s0melapt0p-nix/hardware/cpu.nix @@ -1,4 +1,4 @@ -_: { +{...}: { hardware = { enableRedistributableFirmware = true; cpu = { diff --git a/isla/hardware/graphics.nix b/s0melapt0p-nix/hardware/graphics.nix similarity index 100% rename from isla/hardware/graphics.nix rename to s0melapt0p-nix/hardware/graphics.nix diff --git a/ada/hardware/qmk.nix b/s0melapt0p-nix/hardware/qmk.nix similarity index 91% rename from ada/hardware/qmk.nix rename to s0melapt0p-nix/hardware/qmk.nix index 8742a19..543ece2 100644 --- a/ada/hardware/qmk.nix +++ b/s0melapt0p-nix/hardware/qmk.nix @@ -1,4 +1,4 @@ -_: { +{...}: { hardware = { keyboard = { qmk = { diff --git a/wanda/hardware/zram.nix b/s0melapt0p-nix/hardware/zram.nix similarity index 92% rename from wanda/hardware/zram.nix rename to s0melapt0p-nix/hardware/zram.nix index 0d77537..b973787 100644 --- a/wanda/hardware/zram.nix +++ b/s0melapt0p-nix/hardware/zram.nix @@ -1,4 +1,4 @@ -_: { +{...}: { zramSwap = { enable = true; algorithm = "zstd"; diff --git a/s0melapt0p-nix/home-manager/users.nix b/s0melapt0p-nix/home-manager/users.nix new file mode 100644 index 0000000..04c47d9 --- /dev/null +++ b/s0melapt0p-nix/home-manager/users.nix @@ -0,0 +1,30 @@ +{ + inputs, + self, + ... +}: { + home-manager = { + users = { + hand7s = { + imports = [ + "${self}/hand7s/" + inputs.spicetify-nix.homeManagerModules.default + inputs.hyprland.homeManagerModules.default + inputs.chaotic.homeManagerModules.default + inputs.sops-nix.homeManagerModules.sops + + inputs.nix-index-database.homeModules.nix-index + ]; + }; + }; + + backupFileExtension = "force"; + + extraSpecialArgs = { + inherit + inputs + self + ; + }; + }; +} diff --git a/wanda/i18n/locales.nix b/s0melapt0p-nix/i18n/locales.nix similarity index 93% rename from wanda/i18n/locales.nix rename to s0melapt0p-nix/i18n/locales.nix index f456740..09234a5 100644 --- a/wanda/i18n/locales.nix +++ b/s0melapt0p-nix/i18n/locales.nix @@ -1,4 +1,4 @@ -_: { +{...}: { i18n = { defaultLocale = "en_US.UTF-8"; supportedLocales = [ diff --git a/viola/networking/dhcp.nix b/s0melapt0p-nix/networking/dhcp.nix similarity index 100% rename from viola/networking/dhcp.nix rename to s0melapt0p-nix/networking/dhcp.nix diff --git a/isla/networking/firewall.nix b/s0melapt0p-nix/networking/firewall.nix similarity index 100% rename from isla/networking/firewall.nix rename to s0melapt0p-nix/networking/firewall.nix diff --git a/isla/networking/hostId.nix b/s0melapt0p-nix/networking/hostId.nix similarity index 100% rename from isla/networking/hostId.nix rename to s0melapt0p-nix/networking/hostId.nix diff --git a/isla/networking/hostname.nix b/s0melapt0p-nix/networking/hostname.nix similarity index 100% rename from isla/networking/hostname.nix rename to s0melapt0p-nix/networking/hostname.nix diff --git a/isla/networking/hosts.nix b/s0melapt0p-nix/networking/hosts.nix similarity index 100% rename from isla/networking/hosts.nix rename to s0melapt0p-nix/networking/hosts.nix diff --git a/ada/networking/nameservers.nix b/s0melapt0p-nix/networking/nameservers.nix similarity index 98% rename from ada/networking/nameservers.nix rename to s0melapt0p-nix/networking/nameservers.nix index 31726b9..a4d22c1 100644 --- a/ada/networking/nameservers.nix +++ b/s0melapt0p-nix/networking/nameservers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { nameservers = [ # cf dns diff --git a/isla/networking/networkmanager.nix b/s0melapt0p-nix/networking/networkmanager.nix similarity index 100% rename from isla/networking/networkmanager.nix rename to s0melapt0p-nix/networking/networkmanager.nix diff --git a/wanda/networking/timeServers.nix b/s0melapt0p-nix/networking/timeServers.nix similarity index 94% rename from wanda/networking/timeServers.nix rename to s0melapt0p-nix/networking/timeServers.nix index 9289ea6..88e14c4 100644 --- a/wanda/networking/timeServers.nix +++ b/s0melapt0p-nix/networking/timeServers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { timeServers = [ "0.nixos.pool.ntp.org" diff --git a/viola/networking/wireguard.nix b/s0melapt0p-nix/networking/wireguard.nix similarity index 88% rename from viola/networking/wireguard.nix rename to s0melapt0p-nix/networking/wireguard.nix index bd2336c..2ee5c02 100644 --- a/viola/networking/wireguard.nix +++ b/s0melapt0p-nix/networking/wireguard.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { wireguard = { enable = true; diff --git a/viola/nix/package.nix b/s0melapt0p-nix/nix/package.nix similarity index 100% rename from viola/nix/package.nix rename to s0melapt0p-nix/nix/package.nix diff --git a/kyra/nix/settings/allowed-users.nix b/s0melapt0p-nix/nix/settings/allowed-users.nix similarity index 92% rename from kyra/nix/settings/allowed-users.nix rename to s0melapt0p-nix/nix/settings/allowed-users.nix index 0239519..d483d0c 100644 --- a/kyra/nix/settings/allowed-users.nix +++ b/s0melapt0p-nix/nix/settings/allowed-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { sandbox = true; diff --git a/ada/nix/settings/auto-optimise-store.nix b/s0melapt0p-nix/nix/settings/auto-optimise-store.nix similarity index 89% rename from ada/nix/settings/auto-optimise-store.nix rename to s0melapt0p-nix/nix/settings/auto-optimise-store.nix index cb7a22a..14f13c5 100644 --- a/ada/nix/settings/auto-optimise-store.nix +++ b/s0melapt0p-nix/nix/settings/auto-optimise-store.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { auto-optimise-store = true; diff --git a/viola/nix/settings/experimental-features.nix b/s0melapt0p-nix/nix/settings/experimental-features.nix similarity index 93% rename from viola/nix/settings/experimental-features.nix rename to s0melapt0p-nix/nix/settings/experimental-features.nix index 9c45bc4..7ce7e89 100644 --- a/viola/nix/settings/experimental-features.nix +++ b/s0melapt0p-nix/nix/settings/experimental-features.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { experimental-features = [ diff --git a/viola/nix/settings/substituters.nix b/s0melapt0p-nix/nix/settings/substituters.nix similarity index 82% rename from viola/nix/settings/substituters.nix rename to s0melapt0p-nix/nix/settings/substituters.nix index da0035f..762ec5c 100644 --- a/viola/nix/settings/substituters.nix +++ b/s0melapt0p-nix/nix/settings/substituters.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { substituters = [ @@ -9,10 +9,10 @@ _: { # cachix "https://nix-community.cachix.org/" "https://chaotic-nyx.cachix.org/" + "https://ags.cachix.org" "https://hyprland.cachix.org" "https://chaotic-nyx.cachix.org/" - # nix-community - "https://hydra.nix-community.org/" + "https://colmena.cachix.org" ]; }; }; diff --git a/viola/nix/settings/trusted-public-keys.nix b/s0melapt0p-nix/nix/settings/trusted-public-keys.nix similarity index 98% rename from viola/nix/settings/trusted-public-keys.nix rename to s0melapt0p-nix/nix/settings/trusted-public-keys.nix index 4a128cb..e8710cb 100644 --- a/viola/nix/settings/trusted-public-keys.nix +++ b/s0melapt0p-nix/nix/settings/trusted-public-keys.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-public-keys = [ diff --git a/kyra/nix/settings/trusted-users.nix b/s0melapt0p-nix/nix/settings/trusted-users.nix similarity index 91% rename from kyra/nix/settings/trusted-users.nix rename to s0melapt0p-nix/nix/settings/trusted-users.nix index 4eee825..e4a9dae 100644 --- a/kyra/nix/settings/trusted-users.nix +++ b/s0melapt0p-nix/nix/settings/trusted-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-users = [ diff --git a/wanda/nixpkgs/config.nix b/s0melapt0p-nix/nixpkgs/config.nix similarity index 91% rename from wanda/nixpkgs/config.nix rename to s0melapt0p-nix/nixpkgs/config.nix index b93e4ef..27b79b0 100644 --- a/wanda/nixpkgs/config.nix +++ b/s0melapt0p-nix/nixpkgs/config.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { config = { allowUnfree = true; diff --git a/wanda/nixpkgs/overlays.nix b/s0melapt0p-nix/nixpkgs/overlays.nix similarity index 83% rename from wanda/nixpkgs/overlays.nix rename to s0melapt0p-nix/nixpkgs/overlays.nix index 8db0844..2881eba 100644 --- a/wanda/nixpkgs/overlays.nix +++ b/s0melapt0p-nix/nixpkgs/overlays.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { overlays = [ ]; diff --git a/ada/nixpkgs/system.nix b/s0melapt0p-nix/nixpkgs/system.nix similarity index 90% rename from ada/nixpkgs/system.nix rename to s0melapt0p-nix/nixpkgs/system.nix index 3cbe59a..63fda3b 100644 --- a/ada/nixpkgs/system.nix +++ b/s0melapt0p-nix/nixpkgs/system.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { system = "x86_64-linux"; hostPlatform = "x86_64-linux"; diff --git a/isla/programs/gamemode.nix b/s0melapt0p-nix/programs/gamemode.nix similarity index 100% rename from isla/programs/gamemode.nix rename to s0melapt0p-nix/programs/gamemode.nix diff --git a/ada/programs/nh.nix b/s0melapt0p-nix/programs/nh.nix similarity index 95% rename from ada/programs/nh.nix rename to s0melapt0p-nix/programs/nh.nix index 6d9937d..f43fb06 100644 --- a/ada/programs/nh.nix +++ b/s0melapt0p-nix/programs/nh.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { nh = { enable = true; diff --git a/viola/programs/ssh.nix b/s0melapt0p-nix/programs/ssh.nix similarity index 88% rename from viola/programs/ssh.nix rename to s0melapt0p-nix/programs/ssh.nix index 5028eaf..b7b9d20 100644 --- a/viola/programs/ssh.nix +++ b/s0melapt0p-nix/programs/ssh.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { ssh = { startAgent = true; diff --git a/isla/programs/steam.nix b/s0melapt0p-nix/programs/steam.nix similarity index 100% rename from isla/programs/steam.nix rename to s0melapt0p-nix/programs/steam.nix diff --git a/ada/programs/yubikey-touch-detector.nix b/s0melapt0p-nix/programs/yubikey-touch-detector.nix similarity index 93% rename from ada/programs/yubikey-touch-detector.nix rename to s0melapt0p-nix/programs/yubikey-touch-detector.nix index 92fe31f..c9815c5 100644 --- a/ada/programs/yubikey-touch-detector.nix +++ b/s0melapt0p-nix/programs/yubikey-touch-detector.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { yubikey-touch-detector = { enable = true; diff --git a/isla/security/pam/services.nix b/s0melapt0p-nix/security/pam/services.nix similarity index 100% rename from isla/security/pam/services.nix rename to s0melapt0p-nix/security/pam/services.nix diff --git a/ada/security/polkit.nix b/s0melapt0p-nix/security/polkit.nix similarity index 93% rename from ada/security/polkit.nix rename to s0melapt0p-nix/security/polkit.nix index 77e04d1..7604e82 100644 --- a/ada/security/polkit.nix +++ b/s0melapt0p-nix/security/polkit.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { polkit = { enable = true; diff --git a/ada/security/rtkit.nix b/s0melapt0p-nix/security/rtkit.nix similarity index 87% rename from ada/security/rtkit.nix rename to s0melapt0p-nix/security/rtkit.nix index dd40f89..d3604df 100644 --- a/ada/security/rtkit.nix +++ b/s0melapt0p-nix/security/rtkit.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { rtkit = { enable = true; diff --git a/ada/security/sudo-rs.nix b/s0melapt0p-nix/security/sudo-rs.nix similarity index 93% rename from ada/security/sudo-rs.nix rename to s0melapt0p-nix/security/sudo-rs.nix index 4f270c9..772460d 100644 --- a/ada/security/sudo-rs.nix +++ b/s0melapt0p-nix/security/sudo-rs.nix @@ -1,4 +1,4 @@ -_: { +{...}: { security = { sudo-rs = { enable = true; diff --git a/viola/security/sudo.nix b/s0melapt0p-nix/security/sudo.nix similarity index 100% rename from viola/security/sudo.nix rename to s0melapt0p-nix/security/sudo.nix diff --git a/isla/services/fprintd.nix b/s0melapt0p-nix/services/fprintd.nix similarity index 100% rename from isla/services/fprintd.nix rename to s0melapt0p-nix/services/fprintd.nix diff --git a/isla/services/greetd.nix b/s0melapt0p-nix/services/greetd.nix similarity index 100% rename from isla/services/greetd.nix rename to s0melapt0p-nix/services/greetd.nix diff --git a/isla/services/libinput.nix b/s0melapt0p-nix/services/libinput.nix similarity index 100% rename from isla/services/libinput.nix rename to s0melapt0p-nix/services/libinput.nix diff --git a/ada/services/netbird.nix b/s0melapt0p-nix/services/netbird.nix similarity index 88% rename from ada/services/netbird.nix rename to s0melapt0p-nix/services/netbird.nix index f375f14..071330a 100644 --- a/ada/services/netbird.nix +++ b/s0melapt0p-nix/services/netbird.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { netbird = { enable = true; diff --git a/isla/services/openssh.nix b/s0melapt0p-nix/services/openssh.nix similarity index 100% rename from isla/services/openssh.nix rename to s0melapt0p-nix/services/openssh.nix diff --git a/wanda/services/pipewire.nix b/s0melapt0p-nix/services/pipewire.nix similarity index 96% rename from wanda/services/pipewire.nix rename to s0melapt0p-nix/services/pipewire.nix index 43a9f4e..c4bad1e 100644 --- a/wanda/services/pipewire.nix +++ b/s0melapt0p-nix/services/pipewire.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { pipewire = { enable = true; @@ -25,7 +25,6 @@ _: { extraConfig = { pipewire = { - # PIPEWIRE_PROPS=node.force-rate=0 "92-low-latency" = { "context.properties" = { "default.clock.rate" = 48000; diff --git a/isla/services/qmk.nix b/s0melapt0p-nix/services/qmk.nix similarity index 100% rename from isla/services/qmk.nix rename to s0melapt0p-nix/services/qmk.nix diff --git a/isla/services/thinkfan.nix b/s0melapt0p-nix/services/thinkfan.nix similarity index 100% rename from isla/services/thinkfan.nix rename to s0melapt0p-nix/services/thinkfan.nix diff --git a/viola/services/usbmuxd.nix b/s0melapt0p-nix/services/usbmuxd.nix similarity index 100% rename from viola/services/usbmuxd.nix rename to s0melapt0p-nix/services/usbmuxd.nix diff --git a/isla/services/xserver.nix b/s0melapt0p-nix/services/xserver.nix similarity index 100% rename from isla/services/xserver.nix rename to s0melapt0p-nix/services/xserver.nix diff --git a/isla/services/yggdrasil.nix b/s0melapt0p-nix/services/yggdrasil.nix similarity index 100% rename from isla/services/yggdrasil.nix rename to s0melapt0p-nix/services/yggdrasil.nix diff --git a/isla/services/yubikey-agent.nix b/s0melapt0p-nix/services/yubikey-agent.nix similarity index 100% rename from isla/services/yubikey-agent.nix rename to s0melapt0p-nix/services/yubikey-agent.nix diff --git a/s0melapt0p-nix/services/zapret.nix b/s0melapt0p-nix/services/zapret.nix new file mode 100644 index 0000000..ad671e1 --- /dev/null +++ b/s0melapt0p-nix/services/zapret.nix @@ -0,0 +1,145 @@ +{...}: { + services = { + zapret = { + enable = true; + configureFirewall = true; + qnum = 350; + params = [ + "--wssize 1:6" + + "--filter-tcp=80" + "--dpi-desync=multisplit" + "--dpi-desync-split-pos=10" + "--dpi-desync-repeats=6" + "--new" + + "--filter-tcp=443" + "--dpi-desync=multidisorder" + "--dpi-desync-split-pos=1,midsld" + "--new" + + "--filter-tcp=443" + "--dpi-desync=syndata" + "--dpi-desync-fake-syndata=0x00000000" + "--dpi-desync-ttl=10" + "--new" + + "--filter-udp=443" + "--dpi-desync=fake" + "--dpi-desync-repeats=6" + "--dpi-desync-fake-quic=0x00000000" + "--new" + + "--filter-udp=443" + "--dpi-desync=fake,udplen" + "--dpi-desync-udplen-increment=5" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-cutoff=n3" + "--dpi-desync-repeats=2" + "--new" + + "--filter-tcp=443" + "--dpi-desync=split" + "--dpi-desync-fooling=md5sig,badseq" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync-repeats=10" + "--new" + + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + + "--dpi-desync-autottl" + "--new" + "--filter-tcp=443" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-seqovl=2" + "--dpi-desync-split-pos=2" + "--dpi-desync-autottl" + "--new" + + "--filter-tcp=80" + "--dpi-desync=fake,split2" + "--dpi-desync-fooling=md5sig" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-autottl" + "--new" + + "--filter-tcp=80" + "--dpi-desync-ttl=1" + "--dpi-desync-autottl=2" + "--dpi-desync-fake-tls=0x00000000" + "--dpi-desync-split-pos=1" + "--dpi-desync=fake,split2" + "--dpi-desync-repeats=6" + "--dpi-desync-fooling=md5sig" + "--new" + ]; + + whitelist = [ + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "googlevideo.com" + "youtu.be" + "youtube.com" + "youtubei.googleapis.com" + "youtubeembeddedplayer.googleapis.com" + "ytimg.l.google.com" + "ytimg.com" + "jnn-pa.googleapis.com" + "youtube-nocookie.com" + "youtube-ui.l.google.com" + "yt-video-upload.l.google.com" + "wide-youtube.l.google.com" + "youtubekids.com" + "ggpht.com" + "music.youtube.com" + "test.googlevideo.com" + "discord.com" + "gateway.discord.gg" + "cdn.discordapp.com" + "discordapp.net" + "discordapp.com" + "discord.gg" + "media.discordapp.net" + "images-ext-1.discordapp.net" + "discord.app" + "discord.media" + "discordcdn.com" + "discord.dev" + "discord.new" + "discord.gift" + "discordstatus.com" + "dis.gd" + "discord.co" + "discord-attachments-uploads-prd.storage.googleapis.com" + "7tv.app" + "7tv.io" + "10tv.app" + "x.com" + "t.co" + "ads-twitter.com" + "twimg.com" + "twitter.com" + "pscp.tv" + "twtrdns.net" + "twttr.com" + "periscope.tv" + "tweetdeck.com" + "twitpic.com" + "twitter.co" + "twitterinc.com" + "twitteroauth.com" + "twitterstat.us" + ]; + }; + }; +} diff --git a/ada/services/zerotier.nix b/s0melapt0p-nix/services/zerotier.nix similarity index 92% rename from ada/services/zerotier.nix rename to s0melapt0p-nix/services/zerotier.nix index b864ebf..f58210f 100644 --- a/ada/services/zerotier.nix +++ b/s0melapt0p-nix/services/zerotier.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { zerotierone = { enable = true; diff --git a/viola/system/name.nix b/s0melapt0p-nix/system/name.nix similarity index 100% rename from viola/system/name.nix rename to s0melapt0p-nix/system/name.nix diff --git a/viola/system/stateVersion.nix b/s0melapt0p-nix/system/stateVersion.nix similarity index 100% rename from viola/system/stateVersion.nix rename to s0melapt0p-nix/system/stateVersion.nix diff --git a/viola/systemd/oomd.nix b/s0melapt0p-nix/systemd/oomd.nix similarity index 94% rename from viola/systemd/oomd.nix rename to s0melapt0p-nix/systemd/oomd.nix index bb9a200..cbd28f2 100644 --- a/viola/systemd/oomd.nix +++ b/s0melapt0p-nix/systemd/oomd.nix @@ -1,4 +1,4 @@ -_: { +{...}: { systemd = { oomd = { enable = true; diff --git a/viola/time/timeZone.nix b/s0melapt0p-nix/time/timeZone.nix similarity index 90% rename from viola/time/timeZone.nix rename to s0melapt0p-nix/time/timeZone.nix index cef1656..57bca35 100644 --- a/viola/time/timeZone.nix +++ b/s0melapt0p-nix/time/timeZone.nix @@ -1,4 +1,4 @@ -_: { +{...}: { time = { timeZone = "Europe/Moscow"; hardwareClockInLocalTime = true; diff --git a/viola/users/mutableUsers.nix b/s0melapt0p-nix/users/mutableUsers.nix similarity index 83% rename from viola/users/mutableUsers.nix rename to s0melapt0p-nix/users/mutableUsers.nix index 9bb56d0..54415f1 100644 --- a/viola/users/mutableUsers.nix +++ b/s0melapt0p-nix/users/mutableUsers.nix @@ -1,4 +1,4 @@ -_: { +{...}: { users = { mutableUsers = false; }; diff --git a/ada/users/users/hand7s.nix b/s0melapt0p-nix/users/users/hand7s.nix similarity index 82% rename from ada/users/users/hand7s.nix rename to s0melapt0p-nix/users/users/hand7s.nix index 39aed35..8c0df47 100644 --- a/ada/users/users/hand7s.nix +++ b/s0melapt0p-nix/users/users/hand7s.nix @@ -1,13 +1,15 @@ -_: { +{...}: { users = { users = { - "hand7s" = { + hand7s = { description = "me"; isSystemUser = false; isNormalUser = true; initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; extraGroups = [ "wheel" + "networkmanager" + "docker" ]; }; }; diff --git a/viola/users/users/root.nix b/s0melapt0p-nix/users/users/root.nix similarity index 88% rename from viola/users/users/root.nix rename to s0melapt0p-nix/users/users/root.nix index faa89b7..595a6f6 100644 --- a/viola/users/users/root.nix +++ b/s0melapt0p-nix/users/users/root.nix @@ -1,7 +1,7 @@ -_: { +{...}: { users = { users = { - "root" = { + root = { initialHashedPassword = "$6$n4OLMvYHHStHvtmr$6OL0NV1dEM2b6oJRewkhuoFxM80lI67tfbJ6QkCg8WAA1gbeKrcwDAuJjm8zvpY4zcDR3Z5Zbo8uebfOi6XXF0"; }; }; diff --git a/viola/virtualisation/docker.nix b/s0melapt0p-nix/virtualisation/docker.nix similarity index 93% rename from viola/virtualisation/docker.nix rename to s0melapt0p-nix/virtualisation/docker.nix index 805ac30..1edae88 100644 --- a/viola/virtualisation/docker.nix +++ b/s0melapt0p-nix/virtualisation/docker.nix @@ -1,4 +1,4 @@ -_: { +{...}: { virtualisation = { docker = { enable = true; diff --git a/wanda/xdg/icons.nix b/s0melapt0p-nix/xdg/icons.nix similarity index 86% rename from wanda/xdg/icons.nix rename to s0melapt0p-nix/xdg/icons.nix index 7c75adf..53ccd0b 100644 --- a/wanda/xdg/icons.nix +++ b/s0melapt0p-nix/xdg/icons.nix @@ -1,4 +1,4 @@ -_: { +{...}: { xdg = { icons = { enable = true; diff --git a/wanda/xdg/mime.nix b/s0melapt0p-nix/xdg/mime.nix similarity index 96% rename from wanda/xdg/mime.nix rename to s0melapt0p-nix/xdg/mime.nix index 9197f59..4b6af20 100644 --- a/wanda/xdg/mime.nix +++ b/s0melapt0p-nix/xdg/mime.nix @@ -1,4 +1,4 @@ -_: { +{...}: { xdg = { mime = { enable = true; diff --git a/isla/xdg/portal.nix b/s0melapt0p-nix/xdg/portal.nix similarity index 100% rename from isla/xdg/portal.nix rename to s0melapt0p-nix/xdg/portal.nix diff --git a/kyra/boot/initrd/availableKernelModules.nix b/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix similarity index 97% rename from kyra/boot/initrd/availableKernelModules.nix rename to s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix index b20a92e..271f217 100644 --- a/kyra/boot/initrd/availableKernelModules.nix +++ b/s0mev1rtn0de-nix/boot/initrd/availableKernelModules.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { initrd = { availableKernelModules = [ diff --git a/kyra/boot/initrd/kernelModules.nix b/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix similarity index 95% rename from kyra/boot/initrd/kernelModules.nix rename to s0mev1rtn0de-nix/boot/initrd/kernelModules.nix index 61c2afd..bb2e6e4 100644 --- a/kyra/boot/initrd/kernelModules.nix +++ b/s0mev1rtn0de-nix/boot/initrd/kernelModules.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { initrd = { kernelModules = [ diff --git a/kyra/boot/kernel.nix b/s0mev1rtn0de-nix/boot/kernel.nix similarity index 62% rename from kyra/boot/kernel.nix rename to s0mev1rtn0de-nix/boot/kernel.nix index fcbd80d..4738412 100644 --- a/kyra/boot/kernel.nix +++ b/s0mev1rtn0de-nix/boot/kernel.nix @@ -1,11 +1,9 @@ -_: { +{...}: { boot = { kernel = { sysctl = { "net.ipv4.ip_forward" = 1; "net.ipv6.conf.all.forwarding" = 1; - "net.ipv4.ip_nonlocal_bind" = 1; - "net.ipv6.ip_nonlocal_bind" = 1; }; }; }; diff --git a/kyra/boot/loader/grub.nix b/s0mev1rtn0de-nix/boot/loader/grub.nix similarity index 94% rename from kyra/boot/loader/grub.nix rename to s0mev1rtn0de-nix/boot/loader/grub.nix index fc1a00b..b29ade0 100644 --- a/kyra/boot/loader/grub.nix +++ b/s0mev1rtn0de-nix/boot/loader/grub.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { loader = { grub = { diff --git a/kyra/boot/tmp.nix b/s0mev1rtn0de-nix/boot/tmp.nix similarity index 87% rename from kyra/boot/tmp.nix rename to s0mev1rtn0de-nix/boot/tmp.nix index 0482683..98694f7 100644 --- a/kyra/boot/tmp.nix +++ b/s0mev1rtn0de-nix/boot/tmp.nix @@ -1,4 +1,4 @@ -_: { +{...}: { boot = { tmp = { cleanOnBoot = true; diff --git a/s0mev1rtn0de-nix/default.nix b/s0mev1rtn0de-nix/default.nix new file mode 100644 index 0000000..9962459 --- /dev/null +++ b/s0mev1rtn0de-nix/default.nix @@ -0,0 +1,58 @@ +{...}: { + imports = [ + "${self}/s0mev1rtn0de/disko/disk.nix" + "${self}/s0mev1rtn0de/disko/lvm_vg.nix" + + "${self}/s0mev1rtn0de/boot/initrd/availableKernelModules.nix" + "${self}/s0mev1rtn0de/boot/initrd/kernelModules.nix" + "${self}/s0mev1rtn0de/boot/loader/grub.nix" + "${self}/s0mev1rtn0de/boot/kernel.nix" + "${self}/s0mev1rtn0de/boot/tmp.nix" + + "${self}/s0mev1rtn0de/environment/systemPackages.nix" + + "${self}/s0mev1rtn0de/hardware/zram.nix" + + "${self}/s0mev1rtn0de/networking/firewall/ens3.nix" + "${self}/s0mev1rtn0de/networking/firewall/wt0.nix" + "${self}/s0mev1rtn0de/networking/firewall.nix" + "${self}/s0mev1rtn0de/networking/hostname.nix" + "${self}/s0mev1rtn0de/networking/dns.nix" + "${self}/s0mev1rtn0de/networking/nftables.nix" + "${self}/s0mev1rtn0de/networking/wireguard.nix" + "${self}/s0mev1rtn0de/networking/wg-quick.nix" + "${self}/s0mev1rtn0de/networking/nat.nix" + + "${self}/s0mev1rtn0de/nix/settings/allowed-users.nix" + "${self}/s0mev1rtn0de/nix/settings/experimental-features.nix" + "${self}/s0mev1rtn0de/nix/settings/substituters.nix" + "${self}/s0mev1rtn0de/nix/settings/trusted-public-keys.nix" + "${self}/s0mev1rtn0de/nix/settings/trusted-users.nix" + "${self}/s0mev1rtn0de/nix/settings/auto-optimise-store.nix" + + "${self}/s0mev1rtn0de/nixpkgs/config.nix" + "${self}/s0mev1rtn0de/nixpkgs/platform.nix" + + "${self}/s0mev1rtn0de/programs/nh.nix" + + "${self}/s0mev1rtn0de/services/openssh.nix" + "${self}/s0mev1rtn0de/services/fail2ban.nix" + "${self}/s0mev1rtn0de/services/netbird.nix" + "${self}/s0mev1rtn0de/services/qemuGuest.nix" + "${self}/s0mev1rtn0de/services/caddy.nix" + "${self}/s0mev1rtn0de/services/sing-box.nix" + + "${self}/s0mev1rtn0de/sops/age.nix" + "${self}/s0mev1rtn0de/sops/defaults.nix" + "${self}/s0mev1rtn0de/sops/secrets.nix" + + "${self}/s0mev1rtn0de/system/stateVersion.nix" + + "${self}/s0mev1rtn0de/users/users.nix" + "${self}/s0mev1rtn0de/users/users/askhat.nix" + "${self}/s0mev1rtn0de/users/users/hand7s.nix" + "${self}/s0mev1rtn0de/users/users/root.nix" + + "${self}/s0mev1rtn0de/virtualisation/docker.nix" + ]; +} diff --git a/kyra/disko/disk.nix b/s0mev1rtn0de-nix/disko/disk.nix similarity index 100% rename from kyra/disko/disk.nix rename to s0mev1rtn0de-nix/disko/disk.nix diff --git a/kyra/disko/lvm_vg.nix b/s0mev1rtn0de-nix/disko/lvm_vg.nix similarity index 100% rename from kyra/disko/lvm_vg.nix rename to s0mev1rtn0de-nix/disko/lvm_vg.nix diff --git a/kyra/environment/systemPackages.nix b/s0mev1rtn0de-nix/environment/systemPackages.nix similarity index 100% rename from kyra/environment/systemPackages.nix rename to s0mev1rtn0de-nix/environment/systemPackages.nix diff --git a/kyra/hardware/zram.nix b/s0mev1rtn0de-nix/hardware/zram.nix similarity index 92% rename from kyra/hardware/zram.nix rename to s0mev1rtn0de-nix/hardware/zram.nix index 0d77537..b973787 100644 --- a/kyra/hardware/zram.nix +++ b/s0mev1rtn0de-nix/hardware/zram.nix @@ -1,4 +1,4 @@ -_: { +{...}: { zramSwap = { enable = true; algorithm = "zstd"; diff --git a/kyra/networking/dns.nix b/s0mev1rtn0de-nix/networking/dns.nix similarity index 58% rename from kyra/networking/dns.nix rename to s0mev1rtn0de-nix/networking/dns.nix index 31726b9..6c66cc5 100644 --- a/kyra/networking/dns.nix +++ b/s0mev1rtn0de-nix/networking/dns.nix @@ -1,27 +1,14 @@ -_: { +{...}: { networking = { nameservers = [ - # cf dns "1.1.1.1" "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" - - # google dns "8.8.8.8" "8.8.4.4" + "2606:4700:4700::1111" + "2606:4700:4700::1001" "2001:4860:4860::8888" "2001:4860:4860::8844" - - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" - - # open dns - "208.67.222.222" - "208.67.220.220" "2620:119:35::35" "2620:119:53::53" ]; diff --git a/kyra/networking/firewall.nix b/s0mev1rtn0de-nix/networking/firewall.nix similarity index 94% rename from kyra/networking/firewall.nix rename to s0mev1rtn0de-nix/networking/firewall.nix index a9a2c40..b7f2db8 100644 --- a/kyra/networking/firewall.nix +++ b/s0mev1rtn0de-nix/networking/firewall.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { firewall = { enable = true; diff --git a/s0mev1rtn0de-nix/networking/firewall/ens3.nix b/s0mev1rtn0de-nix/networking/firewall/ens3.nix new file mode 100644 index 0000000..fc74f60 --- /dev/null +++ b/s0mev1rtn0de-nix/networking/firewall/ens3.nix @@ -0,0 +1,21 @@ +{...}: { + networking = { + firewall = { + interfaces = { + ens3 = { + allowedUDPPorts = [ + 443 + 53590 + 53570 + ]; + + allowedTCPPorts = [ + 443 + 53590 + 53570 + ]; + }; + }; + }; + }; +} diff --git a/s0mev1rtn0de-nix/networking/firewall/wt0.nix b/s0mev1rtn0de-nix/networking/firewall/wt0.nix new file mode 100644 index 0000000..564d82d --- /dev/null +++ b/s0mev1rtn0de-nix/networking/firewall/wt0.nix @@ -0,0 +1,17 @@ +{...}: { + networking = { + firewall = { + interfaces = { + wt0 = { + allowedUDPPorts = [ + 39856 + ]; + + allowedTCPPorts = [ + 39856 + ]; + }; + }; + }; + }; +} diff --git a/s0mev1rtn0de-nix/networking/hostname.nix b/s0mev1rtn0de-nix/networking/hostname.nix new file mode 100644 index 0000000..1781f05 --- /dev/null +++ b/s0mev1rtn0de-nix/networking/hostname.nix @@ -0,0 +1,5 @@ +{...}: { + networking = { + hostName = "s0mev1rtn0de-nix"; + }; +} diff --git a/s0mev1rtn0de-nix/networking/interfaces/ens3.nix b/s0mev1rtn0de-nix/networking/interfaces/ens3.nix new file mode 100644 index 0000000..7bebc8a --- /dev/null +++ b/s0mev1rtn0de-nix/networking/interfaces/ens3.nix @@ -0,0 +1,16 @@ +{...}: { + networking = { + interfaces = { + ens3 = { + ipv6 = { + addresses = [ + { + address = ""; + prefixLength = 128; + } + ]; + }; + }; + }; + }; +} diff --git a/s0mev1rtn0de-nix/networking/nat.nix b/s0mev1rtn0de-nix/networking/nat.nix new file mode 100644 index 0000000..6ff577a --- /dev/null +++ b/s0mev1rtn0de-nix/networking/nat.nix @@ -0,0 +1,12 @@ +{...}: { + networking = { + nat = { + enable = true; + enableIPv6 = true; + externalInterface = "ens3"; + internalInterfaces = [ + "wg0" + ]; + }; + }; +} diff --git a/wanda/networking/networkmanager.nix b/s0mev1rtn0de-nix/networking/nftables.nix similarity index 50% rename from wanda/networking/networkmanager.nix rename to s0mev1rtn0de-nix/networking/nftables.nix index 474d212..d0601b3 100644 --- a/wanda/networking/networkmanager.nix +++ b/s0mev1rtn0de-nix/networking/nftables.nix @@ -1,9 +1,7 @@ -_: { +{...}: { networking = { - networkmanager = { + nftables = { enable = false; }; - - useNetworkd = true; }; } diff --git a/s0mev1rtn0de-nix/networking/wg-quick.nix b/s0mev1rtn0de-nix/networking/wg-quick.nix new file mode 100644 index 0000000..4bab50d --- /dev/null +++ b/s0mev1rtn0de-nix/networking/wg-quick.nix @@ -0,0 +1,50 @@ +{ + config, + pkgs, + lib, + ... +}: { + networking = { + wg-quick = { + interfaces = { + wg0 = { + type = "wireguard"; + listenPort = 53590; + privateKeyFile = config.sops.secrets.privateWgKey; + + address = [ + "10.100.0.1/24" + ]; + + postUp = '' + ${lib.getExe' pkgs.iptables "iptables"} -A FORWARD -i wg0 -j ACCEPT + ${lib.getExe' pkgs.iptables "iptables"} -t nat -A POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE + ''; + + preDown = '' + ${lib.getExe' pkgs.iptables "iptables"} -D FORWARD -i wg0 -j ACCEPT + ${lib.getExe' pkgs.iptables "iptables"} -t nat -D POSTROUTING -s 10.100.0.0/24 -o ens3 -j MASQUERADE + ''; + + peers = [ + { + publicKey = "{}"; + presharedKeyFile = config.sops.secrets.presharedWgKey1; + allowedIPs = [ + "10.100.0.2/32" + ]; + } + + { + publicKey = "{}"; + presharedKeyFile = config.sops.secrets.presharedWgKey2; + allowedIPs = [ + "10.100.0.3/32" + ]; + } + ]; + }; + }; + }; + }; +} diff --git a/wanda/networking/wireguard.nix b/s0mev1rtn0de-nix/networking/wireguard.nix similarity index 88% rename from wanda/networking/wireguard.nix rename to s0mev1rtn0de-nix/networking/wireguard.nix index bd2336c..2ee5c02 100644 --- a/wanda/networking/wireguard.nix +++ b/s0mev1rtn0de-nix/networking/wireguard.nix @@ -1,4 +1,4 @@ -_: { +{...}: { networking = { wireguard = { enable = true; diff --git a/viola/nix/settings/allowed-users.nix b/s0mev1rtn0de-nix/nix/settings/allowed-users.nix similarity index 92% rename from viola/nix/settings/allowed-users.nix rename to s0mev1rtn0de-nix/nix/settings/allowed-users.nix index 0239519..d483d0c 100644 --- a/viola/nix/settings/allowed-users.nix +++ b/s0mev1rtn0de-nix/nix/settings/allowed-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { sandbox = true; diff --git a/viola/nix/settings/auto-optimise-store.nix b/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix similarity index 89% rename from viola/nix/settings/auto-optimise-store.nix rename to s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix index cb7a22a..14f13c5 100644 --- a/viola/nix/settings/auto-optimise-store.nix +++ b/s0mev1rtn0de-nix/nix/settings/auto-optimise-store.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { auto-optimise-store = true; diff --git a/ada/nix/settings/experimental-features.nix b/s0mev1rtn0de-nix/nix/settings/experimental-features.nix similarity index 93% rename from ada/nix/settings/experimental-features.nix rename to s0mev1rtn0de-nix/nix/settings/experimental-features.nix index 9c45bc4..7ce7e89 100644 --- a/ada/nix/settings/experimental-features.nix +++ b/s0mev1rtn0de-nix/nix/settings/experimental-features.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { experimental-features = [ diff --git a/wanda/nix/settings/trusted-substituters.nix b/s0mev1rtn0de-nix/nix/settings/substituters.nix similarity index 92% rename from wanda/nix/settings/trusted-substituters.nix rename to s0mev1rtn0de-nix/nix/settings/substituters.nix index b5d0387..9136405 100644 --- a/wanda/nix/settings/trusted-substituters.nix +++ b/s0mev1rtn0de-nix/nix/settings/substituters.nix @@ -1,7 +1,7 @@ -_: { +{...}: { nix = { settings = { - trusted-substituters = [ + substituters = [ # cache.nixos.org "https://nixos-cache-proxy.cofob.dev" "https://cache.nixos.org" diff --git a/kyra/nix/settings/trusted-public-keys.nix b/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix similarity index 98% rename from kyra/nix/settings/trusted-public-keys.nix rename to s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix index e5cc01b..62cbbde 100644 --- a/kyra/nix/settings/trusted-public-keys.nix +++ b/s0mev1rtn0de-nix/nix/settings/trusted-public-keys.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-public-keys = [ diff --git a/wanda/nix/settings/trusted-users.nix b/s0mev1rtn0de-nix/nix/settings/trusted-users.nix similarity index 91% rename from wanda/nix/settings/trusted-users.nix rename to s0mev1rtn0de-nix/nix/settings/trusted-users.nix index 4eee825..e4a9dae 100644 --- a/wanda/nix/settings/trusted-users.nix +++ b/s0mev1rtn0de-nix/nix/settings/trusted-users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nix = { settings = { trusted-users = [ diff --git a/viola/nixpkgs/config.nix b/s0mev1rtn0de-nix/nixpkgs/config.nix similarity index 91% rename from viola/nixpkgs/config.nix rename to s0mev1rtn0de-nix/nixpkgs/config.nix index b93e4ef..0425353 100644 --- a/viola/nixpkgs/config.nix +++ b/s0mev1rtn0de-nix/nixpkgs/config.nix @@ -1,8 +1,8 @@ -_: { +{...}: { nixpkgs = { config = { - allowUnfree = true; allowBroken = true; + allowUnfree = true; }; }; } diff --git a/kyra/nixpkgs/platform.nix b/s0mev1rtn0de-nix/nixpkgs/platform.nix similarity index 90% rename from kyra/nixpkgs/platform.nix rename to s0mev1rtn0de-nix/nixpkgs/platform.nix index 3cbe59a..63fda3b 100644 --- a/kyra/nixpkgs/platform.nix +++ b/s0mev1rtn0de-nix/nixpkgs/platform.nix @@ -1,4 +1,4 @@ -_: { +{...}: { nixpkgs = { system = "x86_64-linux"; hostPlatform = "x86_64-linux"; diff --git a/kyra/programs/nh.nix b/s0mev1rtn0de-nix/programs/nh.nix similarity index 87% rename from kyra/programs/nh.nix rename to s0mev1rtn0de-nix/programs/nh.nix index f3d17d5..d641bad 100644 --- a/kyra/programs/nh.nix +++ b/s0mev1rtn0de-nix/programs/nh.nix @@ -1,4 +1,4 @@ -_: { +{...}: { programs = { nh = { enable = true; diff --git a/kyra/services/caddy.nix b/s0mev1rtn0de-nix/services/caddy.nix similarity index 87% rename from kyra/services/caddy.nix rename to s0mev1rtn0de-nix/services/caddy.nix index fe3ad02..d978c83 100644 --- a/kyra/services/caddy.nix +++ b/s0mev1rtn0de-nix/services/caddy.nix @@ -1,16 +1,7 @@ -{ - config, - pkgs, - lib, - ... -}: { +{pkgs, ...}: { services = { caddy = { - enable = - lib.mkIf ( - config.networking.hostName == "hazel" - ) - true; + enable = true; package = pkgs.caddy.withPlugins { plugins = [ @@ -33,24 +24,28 @@ virtualHosts = { "hand7s.org" = { extraConfig = '' + respond "hi! :D WIP btw" ''; }; "git.hand7s.org" = { extraConfig = '' + reverse_proxy ${homeIP}:53350 ''; }; "bin.hand7s.org" = { extraConfig = '' + reverse_proxy ${homeIP}:80 ''; }; "zitadel.hand7s.org" = { extraConfig = '' + reverse_proxy ${homeIP}:8443 ''; }; diff --git a/kyra/services/fail2ban.nix b/s0mev1rtn0de-nix/services/fail2ban.nix similarity index 97% rename from kyra/services/fail2ban.nix rename to s0mev1rtn0de-nix/services/fail2ban.nix index 87e2508..bb6ee40 100644 --- a/kyra/services/fail2ban.nix +++ b/s0mev1rtn0de-nix/services/fail2ban.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { fail2ban = { enable = true; diff --git a/wanda/services/netbird.nix b/s0mev1rtn0de-nix/services/netbird.nix similarity index 88% rename from wanda/services/netbird.nix rename to s0mev1rtn0de-nix/services/netbird.nix index f375f14..071330a 100644 --- a/wanda/services/netbird.nix +++ b/s0mev1rtn0de-nix/services/netbird.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { netbird = { enable = true; diff --git a/kyra/services/openssh.nix b/s0mev1rtn0de-nix/services/openssh.nix similarity index 90% rename from kyra/services/openssh.nix rename to s0mev1rtn0de-nix/services/openssh.nix index 6d54477..9034b10 100644 --- a/kyra/services/openssh.nix +++ b/s0mev1rtn0de-nix/services/openssh.nix @@ -1,10 +1,7 @@ -_: { +{...}: { services = { openssh = { enable = true; - ports = [ - 58693 - ]; settings = { PrintMotd = false; diff --git a/kyra/services/qemuGuest.nix b/s0mev1rtn0de-nix/services/qemuGuest.nix similarity index 88% rename from kyra/services/qemuGuest.nix rename to s0mev1rtn0de-nix/services/qemuGuest.nix index 7fb4eb6..d0c8739 100644 --- a/kyra/services/qemuGuest.nix +++ b/s0mev1rtn0de-nix/services/qemuGuest.nix @@ -1,4 +1,4 @@ -_: { +{...}: { services = { qemuGuest = { enable = true; diff --git a/kyra/services/sing-box.nix b/s0mev1rtn0de-nix/services/sing-box.nix similarity index 98% rename from kyra/services/sing-box.nix rename to s0mev1rtn0de-nix/services/sing-box.nix index f29526c..f7881c7 100644 --- a/kyra/services/sing-box.nix +++ b/s0mev1rtn0de-nix/services/sing-box.nix @@ -1,4 +1,7 @@ -{...}: { +{ + # config, + ... +}: { services = { sing-box = { enable = true; diff --git a/kyra/system/stateVersion.nix b/s0mev1rtn0de-nix/system/stateVersion.nix similarity index 84% rename from kyra/system/stateVersion.nix rename to s0mev1rtn0de-nix/system/stateVersion.nix index 9d5896e..304a150 100644 --- a/kyra/system/stateVersion.nix +++ b/s0mev1rtn0de-nix/system/stateVersion.nix @@ -1,4 +1,4 @@ -_: { +{...}: { system = { stateVersion = "23.11"; }; diff --git a/kyra/users/users.nix b/s0mev1rtn0de-nix/users/users.nix similarity index 83% rename from kyra/users/users.nix rename to s0mev1rtn0de-nix/users/users.nix index 9bb56d0..54415f1 100644 --- a/kyra/users/users.nix +++ b/s0mev1rtn0de-nix/users/users.nix @@ -1,4 +1,4 @@ -_: { +{...}: { users = { mutableUsers = false; }; diff --git a/s0mev1rtn0de-nix/users/users/askhat.nix b/s0mev1rtn0de-nix/users/users/askhat.nix new file mode 100644 index 0000000..3fba6bc --- /dev/null +++ b/s0mev1rtn0de-nix/users/users/askhat.nix @@ -0,0 +1,23 @@ +{...}: { + users = { + users = { + askhat = { + description = "askhat"; + isNormalUser = true; + hashedPassword = "$y$j9T$t3G0Vj47wHY86twX2bfwr/$kUajwW8gxtu09z9btWBB7YNEcj1Ut3QfYEazWr7utgC"; + extraGroups = [ + "wheel" + "docker" + ]; + + openssh = { + authorizedKeys = { + keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfdXRE2ckx++O1lHFcmZlBMN1Sgy3aqSadOdC+ZOLj5 kixoncon33@gmail.com" + ]; + }; + }; + }; + }; + }; +} diff --git a/kyra/users/users/hand7s.nix b/s0mev1rtn0de-nix/users/users/hand7s.nix similarity index 52% rename from kyra/users/users/hand7s.nix rename to s0mev1rtn0de-nix/users/users/hand7s.nix index 497573a..3ad5002 100644 --- a/kyra/users/users/hand7s.nix +++ b/s0mev1rtn0de-nix/users/users/hand7s.nix @@ -1,7 +1,7 @@ -_: { +{...}: { users = { users = { - "hand7s" = { + hand7s = { description = "hands"; isNormalUser = true; hashedPassword = "$y$j9T$eHfq328GBp7Ga8xsbOTV/0$kcihv7zWLqSkj2jKAhI1pdbTSwvaf2RY5Rokm69XTL/"; @@ -9,14 +9,6 @@ _: { "wheel" "docker" ]; - - openssh = { - authorizedKeys = { - keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDp2IIdR5jV1HyG4aiRX7SfTNrXDhCx5rTiFU40qkOKq litvinovb0@gmail.com" - ]; - }; - }; }; }; }; diff --git a/kyra/users/users/root.nix b/s0mev1rtn0de-nix/users/users/root.nix similarity index 87% rename from kyra/users/users/root.nix rename to s0mev1rtn0de-nix/users/users/root.nix index 4044315..320de35 100644 --- a/kyra/users/users/root.nix +++ b/s0mev1rtn0de-nix/users/users/root.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { users = { users = { - "root" = { + root = { shell = "${pkgs.util-linux}/bin/nologin"; }; }; diff --git a/kyra/virtualisation/docker.nix b/s0mev1rtn0de-nix/virtualisation/docker.nix similarity index 95% rename from kyra/virtualisation/docker.nix rename to s0mev1rtn0de-nix/virtualisation/docker.nix index 59e76bf..df2d700 100644 --- a/kyra/virtualisation/docker.nix +++ b/s0mev1rtn0de-nix/virtualisation/docker.nix @@ -1,4 +1,4 @@ -_: { +{...}: { virtualisation = { oci-containers = { backend = "docker"; diff --git a/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix b/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix new file mode 100644 index 0000000..441db20 --- /dev/null +++ b/s0mev1rtn0de-nix/virtualisation/oci-containers/3x-ui.nix @@ -0,0 +1,26 @@ +{...}: { + virtualisation = { + oci-containers = { + containers = { + "3x-ui" = { + autoStart = true; + image = "ghcr.io/mhsanaei/3x-ui:latest"; + volumes = [ + "/docker/3x-ui/db/:/etc/x-ui/" + "/docker/3x-ui/certs/:/root/cert/" + ]; + + environment = { + XRAY_VMESS_AEAD_FORCED = toString false; + XUI_ENABLE_FAIL2BAN = toString false; + }; + + extraOptions = [ + "--network=host" + "--tty=true" + ]; + }; + }; + }; + }; +} diff --git a/viola/default.nix b/viola/default.nix deleted file mode 100644 index 535051b..0000000 --- a/viola/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{self, ...}: { - imports = [ - "${self}/viola/boot/initrd.nix" - "${self}/viola/boot/kernel.nix" - "${self}/viola/boot/lanzaboote.nix" - "${self}/viola/boot/plymouth.nix" - "${self}/viola/boot/tmp.nix" - "${self}/viola/boot/loader/systemd-boot.nix" - - "${self}/viola/disko/disk.nix" - "${self}/viola/disko/lvm_vg.nix" - - "${self}/viola/console/console.nix" - - "${self}/viola/environment/systemPackages.nix" - "${self}/viola/environment/variables.nix" - - "${self}/viola/hardware/cpu.nix" - "${self}/viola/hardware/graphics.nix" - "${self}/viola/hardware/zram.nix" - - "${self}/viola/home-manager/users.nix" - - "${self}/viola/i18n/locales.nix" - - "${self}/viola/networking/dhcp.nix" - "${self}/viola/networking/firewall.nix" - "${self}/viola/networking/hostname.nix" - "${self}/viola/networking/networkmanager.nix" - "${self}/viola/networking/wireguard.nix" - "${self}/viola/networking/nameservers.nix" - "${self}/viola/networking/hosts.nix" - "${self}/viola/networking/hostId.nix" - "${self}/viola/networking/interfaces.nix" - - "${self}/viola/nix/package.nix" - "${self}/viola/nix/settings/allowed-users.nix" - "${self}/viola/nix/settings/experimental-features.nix" - "${self}/viola/nix/settings/substituters.nix" - "${self}/viola/nix/settings/trusted-public-keys.nix" - "${self}/viola/nix/settings/trusted-users.nix" - "${self}/viola/nix/settings/auto-optimise-store.nix" - - "${self}/viola/nixpkgs/config.nix" - "${self}/viola/nixpkgs/system.nix" - - "${self}/viola/programs/nh.nix" - "${self}/viola/programs/ssh.nix" - - "${self}/viola/security/polkit.nix" - "${self}/viola/security/rtkit.nix" - "${self}/viola/security/sudo.nix" - "${self}/viola/security/sudo-rs.nix" - - "${self}/viola/services/greetd.nix" - "${self}/viola/services/libinput.nix" - "${self}/viola/services/openssh.nix" - "${self}/viola/services/pipewire.nix" - "${self}/viola/services/netbird.nix" - "${self}/viola/services/scx.nix" - "${self}/viola/services/xserver.nix" - "${self}/viola/services/usbmuxd.nix" - "${self}/viola/services/irqbalance.nix" - "${self}/viola/services/forgejo.nix" - "${self}/viola/services/postgresql.nix" - "${self}/viola/services/vaultwarden.nix" - "${self}/viola/services/privatebin.nix" - "${self}/viola/services/woodpecker.nix" - "${self}/viola/services/stalwart.nix" - "${self}/viola/services/homepage.nix" - "${self}/viola/services/redis.nix" - "${self}/viola/services/zitadel.nix" - "${self}/viola/services/garage.nix" - - "${self}/viola/sops/defaults.nix" - "${self}/viola/sops/secrets.nix" - - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" - - "${self}/viola/system/name.nix" - "${self}/viola/system/stateVersion.nix" - - "${self}/viola/systemd/oomd.nix" - "${self}/viola/systemd/slices/system-slice.nix" - "${self}/viola/systemd/slices/user-slice.nix" - "${self}/viola/systemd/slices/root-slice.nix" - - "${self}/viola/time/timeZone.nix" - - "${self}/viola/users/users/hand7s.nix" - "${self}/viola/users/users/root.nix" - "${self}/viola/users/mutableUsers.nix" - - "${self}/viola/virtualisation/docker.nix" - ]; -} diff --git a/viola/hardware/zram.nix b/viola/hardware/zram.nix deleted file mode 100644 index d37077e..0000000 --- a/viola/hardware/zram.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - zramSwap = { - enable = true; - algorithm = "zstd"; - priority = 100; - memoryPercent = 200; - }; -} diff --git a/viola/home-manager/users.nix b/viola/home-manager/users.nix deleted file mode 100644 index 9d92dc6..0000000 --- a/viola/home-manager/users.nix +++ /dev/null @@ -1,26 +0,0 @@ -{self, ...}: { - home-manager = { - users = { - "hand7s" = { - imports = [ - "${self}/hand7s/" - self.inputs.agenix.homeManagerModules.default - self.inputs.spicetify-nix.homeManagerModules.default - self.inputs.hyprland.homeManagerModules.default - self.inputs.chaotic.homeManagerModules.default - self.inputs.sops-nix.homeManagerModules.sops - - self.inputs.nix-index-database.homeModules.nix-index - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - self - ; - }; - }; -} diff --git a/viola/i18n/locales.nix b/viola/i18n/locales.nix deleted file mode 100644 index f456740..0000000 --- a/viola/i18n/locales.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - i18n = { - defaultLocale = "en_US.UTF-8"; - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "ru_RU.UTF-8/UTF-8" - ]; - }; -} diff --git a/viola/networking/hostname.nix b/viola/networking/hostname.nix deleted file mode 100644 index ea70707..0000000 --- a/viola/networking/hostname.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - networking = { - hostName = "viola"; - }; -} diff --git a/viola/nixpkgs/overlays.nix b/viola/nixpkgs/overlays.nix deleted file mode 100644 index 8db0844..0000000 --- a/viola/nixpkgs/overlays.nix +++ /dev/null @@ -1,6 +0,0 @@ -_: { - nixpkgs = { - overlays = [ - ]; - }; -} diff --git a/viola/nixpkgs/system.nix b/viola/nixpkgs/system.nix deleted file mode 100644 index 3cbe59a..0000000 --- a/viola/nixpkgs/system.nix +++ /dev/null @@ -1,6 +0,0 @@ -_: { - nixpkgs = { - system = "x86_64-linux"; - hostPlatform = "x86_64-linux"; - }; -} diff --git a/viola/security/polkit.nix b/viola/security/polkit.nix deleted file mode 100644 index 77e04d1..0000000 --- a/viola/security/polkit.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - security = { - polkit = { - enable = true; - adminIdentities = [ - "unix-group:wheel" - ]; - }; - }; -} diff --git a/viola/services/garage.nix b/viola/services/garage.nix deleted file mode 100644 index 607f265..0000000 --- a/viola/services/garage.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, ...}: { - services = { - garage = { - enable = true; - package = pkgs.garage; - logLevel = "error"; - settings = { - # nope - }; - }; - }; -} diff --git a/viola/services/irqbalance.nix b/viola/services/irqbalance.nix deleted file mode 100644 index ee8472e..0000000 --- a/viola/services/irqbalance.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - services = { - irqbalance = { - enable = true; - }; - }; -} diff --git a/viola/services/netbird.nix b/viola/services/netbird.nix deleted file mode 100644 index f375f14..0000000 --- a/viola/services/netbird.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - services = { - netbird = { - enable = true; - }; - }; -} diff --git a/viola/services/postgresql.nix b/viola/services/postgresql.nix deleted file mode 100644 index 6dda386..0000000 --- a/viola/services/postgresql.nix +++ /dev/null @@ -1,56 +0,0 @@ -{pkgs, ...}: { - services = { - postgresql = { - enable = true; - enableTCPIP = true; - checkConfig = true; - - ensureUsers = [ - { - name = "forgejo"; - ensureDBOwnership = true; - } - - { - name = "vaultwarden"; - ensureDBOwnership = true; - } - - { - name = "woodpecker"; - ensureDBOwnership = true; - } - - { - name = "zitadel"; - ensureDBOwnership = true; - ensureClauses = { - login = true; - superuser = true; - }; - } - - { - name = "stalwart"; - ensureDBOwnership = true; - } - ]; - - ensureDatabases = [ - "vaultwarden" - "forgejo" - "woodpecker" - "stalwart" - "zitadel" - ]; - - initialScript = ""; # nope - - authentication = ""; #nope - - settings = { - port = ${dbport}; - }; - }; - }; -} diff --git a/viola/services/redis.nix b/viola/services/redis.nix deleted file mode 100644 index 976a98a..0000000 --- a/viola/services/redis.nix +++ /dev/null @@ -1,152 +0,0 @@ -{pkgs, ...}: { - services = { - redis = { - package = pkgs.valkey; - servers = { - "forgejo" = { - enable = true; - port = ${cacheport1}; - logLevel = "warning"; - databases = 16; - maxclients = 10000; - requirePass = ${cachepass1}; - - settings = { - stop-writes-on-bgsave-error = "yes"; - rdbcompression = "yes"; - rdbchecksum = "yes"; - - maxmemory = "1GB"; - maxmemory-policy = "volatile-lru"; - maxmemory-samples = 3; - }; - - save = [ - [ - 900 - 1 - ] - - [ - 300 - 10 - ] - - [ - 60 - 1000 - ] - ]; - }; - - "woodpecker" = { - enable = false; - port = ${cacheport2}; - logLevel = "warning"; - databases = 16; - maxclients = 10000; - requirePass = ${cachepass2}; - - settings = { - stop-writes-on-bgsave-error = "yes"; - rdbcompression = "yes"; - rdbchecksum = "yes"; - - maxmemory = "1GB"; - maxmemory-policy = "volatile-lru"; - maxmemory-samples = 3; - }; - - save = [ - [ - 900 - 1 - ] - - [ - 300 - 10 - ] - - [ - 60 - 1000 - ] - ]; - }; - - "stalwart" = { - enable = true; - port = ${cacheport3}; - logLevel = "warning"; - databases = 16; - maxclients = 10000; - requirePass = ${cachepass3}; - - settings = { - stop-writes-on-bgsave-error = "yes"; - rdbcompression = "yes"; - rdbchecksum = "yes"; - - maxmemory = "1GB"; - maxmemory-policy = "volatile-lru"; - maxmemory-samples = 3; - }; - - save = [ - [ - 900 - 1 - ] - - [ - 300 - 10 - ] - - [ - 60 - 1000 - ] - ]; - }; - - "zitadel" = { - enable = true; - port = ${cacheport4}; - logLevel = "warning"; - databases = 16; - maxclients = 10000; - requirePass = ${cachepass4}; - - settings = { - stop-writes-on-bgsave-error = "yes"; - rdbcompression = "yes"; - rdbchecksum = "yes"; - - maxmemory = "1GB"; - maxmemory-policy = "volatile-lru"; - maxmemory-samples = 3; - }; - - save = [ - [ - 900 - 1 - ] - - [ - 300 - 10 - ] - - [ - 60 - 1000 - ] - ]; - }; - }; - }; - }; -} diff --git a/viola/services/stalwart.nix b/viola/services/stalwart.nix deleted file mode 100644 index 37e5f91..0000000 --- a/viola/services/stalwart.nix +++ /dev/null @@ -1,135 +0,0 @@ -_: { - services = { - stalwart-mail = { - enable = true; - settings = { - acme = { - "cloudflare" = { - default = true; - challenge = "dns-01"; - provider = "cloudflare"; - origin = "hand7s.org"; - secret = ${mail_secret}; - contact = [ - "me@hand7s.org" - ]; - - email = "me@hand7s.org"; - directory = "https://acme-staging-v02.api.letsencrypt.org/directory"; - domains = [ - "mail.hand7s.org" - ]; - }; - }; - - server = { - hostname = "mail.hand7s.org"; - - proxy = { - trusted-networks = [ - "::1" - "100.109.213.170/16" - ]; - }; - - listener = { - "lmtp" = { - bind = "[::]:24"; - protocol = "lmtp"; - }; - - "smtp" = { - bind = "[::]:25"; - protocol = "smtp"; - }; - - "pop3" = { - bind = "[::]:110"; - protocol = "pop3"; - }; - - "imap" = { - bind = "[::]:143"; - protocol = "imap"; - }; - - "submissions" = { - bind = "[::]:465"; - protocol = "smtp"; - }; - - "submission" = { - bind = "[::]:587"; - protocol = "smtp"; - }; - - "imaptls" = { - bind = "[::]:993"; - protocol = "smtp"; - }; - - "pop3s" = { - bind = "[::]:995"; - protocol = "pop3"; - }; - - "sieve" = { - bind = "[::]:4190"; - protocol = "managesieve"; - }; - - "management" = { - protocol = "http"; - bind = [ - "127.0.0.1:8980" - ]; - }; - }; - }; - - lookup = { - default = { - hostname = "mail.hand7s.org"; - domain = "hand7s.org"; - }; - }; - - storage = { - data = "postgresql"; - blob = "s3"; - fts = "postgresql"; - lookup = "redis"; - }; - - store = { - # nope - # i'm not redacting my main config - # here to show it here - # refer to stalwart mail - # ty - }; - - authentication = { - fallback-admin = { - user = "admin"; - secret = "admin"; - }; - }; - - tracer = { - journal = { - enable = true; - type = "journal"; - level = "debug"; - }; - - console = { - enable = true; - type = "console"; - level = "trace"; - }; - }; - }; - }; - }; -} diff --git a/viola/services/vaultwarden.nix b/viola/services/vaultwarden.nix deleted file mode 100644 index cddc3d6..0000000 --- a/viola/services/vaultwarden.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - services = { - vaultwarden = { - enable = true; - dbBackend = "postgresql"; - config = { - # holy private thing - # im NOT sharing it here - }; - }; - }; -} diff --git a/viola/services/woodpecker.nix b/viola/services/woodpecker.nix deleted file mode 100644 index c9a69e0..0000000 --- a/viola/services/woodpecker.nix +++ /dev/null @@ -1,20 +0,0 @@ -_: { - services = { - woodpecker-server = { - enable = false; - environment = { - WOODPECKER_OPEN = "true"; - WOODPECKER_DATABASE_DRIVER = "postgres"; - WOODPECKER_DATABASE_DATASOURCE = ${pqsql_socket}; - WOODPECKER_SERVER_ADDR = ${ciport1}; - WOODPECKER_GRPC_ADDR = ${ciport1}; - WOODPECKER_HOST = "https://cicd.hand7s.org"; - - WOODPECKER_FORGEJO = "true"; - WOODPECKER_FORGEJO_URL = "https://git.hand7s.org"; - WOODPECKER_FORGEJO_CLIENT = ${cisecret1}; - FORGEJO_SECRET = ${cisecret2}; - }; - }; - }; -} diff --git a/wanda/console/console.nix b/wanda/console/console.nix deleted file mode 100644 index e3a24c9..0000000 --- a/wanda/console/console.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - console = { - useXkbConfig = true; - }; -} diff --git a/wanda/default.nix b/wanda/default.nix deleted file mode 100644 index 57e97fa..0000000 --- a/wanda/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{self, ...}: { - imports = [ - "${self}/wanda/console/console.nix" - - "${self}/wanda/environment/systemPackages.nix" - "${self}/wanda/environment/variables.nix" - - "${self}/wanda/hardware/zram.nix" - "${self}/wanda/hardware/" - - "${self}/wanda/home-manager/users.nix" - - "${self}/wanda/i18n/locales.nix" - - "${self}/wanda/networking/dhcp.nix" - "${self}/wanda/networking/firewall.nix" - "${self}/wanda/networking/hostname.nix" - "${self}/wanda/networking/networkmanager.nix" - "${self}/wanda/networking/wireguard.nix" - "${self}/wanda/networking/nameservers.nix" - "${self}/wanda/networking/hosts.nix" - "${self}/wanda/networking/hostId.nix" - - "${self}/wanda/nix/package.nix" - "${self}/wanda/nix/settings/allowed-users.nix" - "${self}/wanda/nix/settings/experimental-features.nix" - "${self}/wanda/nix/settings/substituters.nix" - "${self}/wanda/nix/settings/trusted-public-keys.nix" - "${self}/wanda/nix/settings/trusted-substituters.nix" - "${self}/wanda/nix/settings/trusted-users.nix" - "${self}/wanda/nix/settings/auto-optimise-store.nix" - - "${self}/wanda/nixpkgs/config.nix" - "${self}/wanda/nixpkgs/system.nix" - - "${self}/wanda/programs/nh.nix" - "${self}/wanda/programs/ssh.nix" - - "${self}/wanda/security/polkit.nix" - "${self}/wanda/security/rtkit.nix" - "${self}/wanda/security/sudo.nix" - "${self}/wanda/security/sudo-rs.nix" - "${self}/wanda/security/pam/yubico.nix" - - "${self}/wanda/services/greetd.nix" - "${self}/wanda/services/libinput.nix" - "${self}/wanda/services/openssh.nix" - "${self}/wanda/services/pipewire.nix" - "${self}/wanda/services/netbird.nix" - "${self}/wanda/services/qmk.nix" - "${self}/wanda/services/scx.nix" - "${self}/wanda/services/xserver.nix" - "${self}/wanda/services/sunshine.nix" - "${self}/wanda/services/usbmuxd.nix" - "${self}/wanda/services/irqbalance.nix" - "${self}/wanda/services/yubikey-agent.nix" - "${self}/wanda/services/resolved.nix" - - "${self}/wanda/sops/defaults.nix" - "${self}/wanda/sops/secrets.nix" - - "${self}/hand7s/stylix/base16Scheme.nix" - "${self}/hand7s/stylix/cursor.nix" - "${self}/hand7s/stylix/defaults.nix" - "${self}/hand7s/stylix/fonts.nix" - "${self}/hand7s/stylix/image.nix" - - "${self}/wanda/system/name.nix" - "${self}/wanda/system/stateVersion.nix" - - "${self}/wanda/systemd/oomd.nix" - "${self}/wanda/systemd/slices/system-slice.nix" - "${self}/wanda/systemd/slices/user-slice.nix" - "${self}/wanda/systemd/slices/root-slice.nix" - - "${self}/wanda/time/timeZone.nix" - - "${self}/wanda/users/users/hand7s.nix" - "${self}/wanda/users/users/root.nix" - "${self}/wanda/users/mutableUsers.nix" - - "${self}/wanda/wsl/" - "${self}/wanda/wsl/wslConf.nix" - - "${self}/wanda/xdg/icons.nix" - "${self}/wanda/xdg/mime.nix" - "${self}/wanda/xdg/portal.nix" - ]; -} diff --git a/wanda/environment/systemPackages.nix b/wanda/environment/systemPackages.nix deleted file mode 100644 index d508dd5..0000000 --- a/wanda/environment/systemPackages.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - environment = { - systemPackages = with pkgs; [ - (lib.hiPrio uutils-coreutils-noprefix) - uutils-findutils - uutils-diffutils - xdg-desktop-portal - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - home-manager - ]; - }; -} diff --git a/wanda/environment/variables.nix b/wanda/environment/variables.nix deleted file mode 100644 index 9c47685..0000000 --- a/wanda/environment/variables.nix +++ /dev/null @@ -1,17 +0,0 @@ -{config, ...}: { - environment = { - variables = { - AMD_VULKAN_ICD = "AMDVLK"; - HOSTNAME = config.networking.hostName; - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; - GDK_BACKEND = "wayland"; - NIXPKGS_ALLOW_UNFREE = "1"; - NIXPKGS_ALLOW_INSECURE = "1"; - NIXOS_OZONE_WL = "1"; - GRIMBLAST_HIDE_CURSOR = "0"; - TERM = "xterm-256color"; - }; - }; -} diff --git a/wanda/hardware/default.nix b/wanda/hardware/default.nix deleted file mode 100644 index 9f37847..0000000 --- a/wanda/hardware/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - hardware = { - enableAllFirmware = true; - enableAllHardware = true; - enableRedistributableFirmware = true; - firmwareCompression = "zstd"; - }; -} diff --git a/wanda/home-manager/users.nix b/wanda/home-manager/users.nix deleted file mode 100644 index ac58a26..0000000 --- a/wanda/home-manager/users.nix +++ /dev/null @@ -1,28 +0,0 @@ -{self, ...}: { - home-manager = { - users = { - "hand7s" = { - imports = [ - "${self}/hand7s/" - self.inputs.agenix.homeManagerModules.default - self.inputs.agenix.homeManagerModules.default - self.inputs.spicetify-nix.homeManagerModules.default - self.inputs.hyprland.homeManagerModules.default - self.inputs.chaotic.homeManagerModules.default - self.inputs.sops-nix.homeManagerModules.sops - - self.inputs.nix-index-database.homeModules.nix-index - self.inputs.noctalia.homeModules.default - ]; - }; - }; - - backupFileExtension = "force"; - - extraSpecialArgs = { - inherit - self - ; - }; - }; -} diff --git a/wanda/networking/dhcp.nix b/wanda/networking/dhcp.nix deleted file mode 100644 index 0740ea3..0000000 --- a/wanda/networking/dhcp.nix +++ /dev/null @@ -1,10 +0,0 @@ -{lib, ...}: { - networking = { - useDHCP = lib.mkDefault true; - dhcpcd = { - enable = true; - persistent = false; - wait = "any"; - }; - }; -} diff --git a/wanda/networking/firewall.nix b/wanda/networking/firewall.nix deleted file mode 100644 index 1287f81..0000000 --- a/wanda/networking/firewall.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - networking = { - firewall = { - allowPing = true; - enable = true; - }; - }; -} diff --git a/wanda/networking/hostname.nix b/wanda/networking/hostname.nix deleted file mode 100644 index c91aef8..0000000 --- a/wanda/networking/hostname.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - networking = { - hostName = "wanda"; - }; -} diff --git a/wanda/networking/hosts.nix b/wanda/networking/hosts.nix deleted file mode 100644 index 2ebdee6..0000000 --- a/wanda/networking/hosts.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - networking = { - hosts = { - # nope. - }; - }; -} diff --git a/wanda/networking/nameservers.nix b/wanda/networking/nameservers.nix deleted file mode 100644 index 31726b9..0000000 --- a/wanda/networking/nameservers.nix +++ /dev/null @@ -1,29 +0,0 @@ -_: { - networking = { - nameservers = [ - # cf dns - "1.1.1.1" - "1.0.0.1" - "2606:4700:4700::1111" - "2606:4700:4700::1001" - - # google dns - "8.8.8.8" - "8.8.4.4" - "2001:4860:4860::8888" - "2001:4860:4860::8844" - - # q9 dns - "9.9.9.9" - "149.112.112.112" - "2620:fe::fe" - "2620:fe::9" - - # open dns - "208.67.222.222" - "208.67.220.220" - "2620:119:35::35" - "2620:119:53::53" - ]; - }; -} diff --git a/wanda/nix/package.nix b/wanda/nix/package.nix deleted file mode 100644 index b2d6823..0000000 --- a/wanda/nix/package.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - nix = { - package = pkgs.nixVersions.latest; - }; -} diff --git a/wanda/nix/settings/allowed-users.nix b/wanda/nix/settings/allowed-users.nix deleted file mode 100644 index 0239519..0000000 --- a/wanda/nix/settings/allowed-users.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - nix = { - settings = { - sandbox = true; - allowed-users = [ - "@wheel" - ]; - }; - }; -} diff --git a/wanda/nix/settings/auto-optimise-store.nix b/wanda/nix/settings/auto-optimise-store.nix deleted file mode 100644 index cb7a22a..0000000 --- a/wanda/nix/settings/auto-optimise-store.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - nix = { - settings = { - auto-optimise-store = true; - }; - }; -} diff --git a/wanda/nix/settings/experimental-features.nix b/wanda/nix/settings/experimental-features.nix deleted file mode 100644 index 9c45bc4..0000000 --- a/wanda/nix/settings/experimental-features.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - nix = { - settings = { - experimental-features = [ - "nix-command" - "flakes" - ]; - }; - }; -} diff --git a/wanda/nix/settings/trusted-public-keys.nix b/wanda/nix/settings/trusted-public-keys.nix deleted file mode 100644 index 4a128cb..0000000 --- a/wanda/nix/settings/trusted-public-keys.nix +++ /dev/null @@ -1,19 +0,0 @@ -_: { - nix = { - settings = { - trusted-public-keys = [ - # cache.nixos.org - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - # cache.garnix.io - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # cachix.org - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "ags.cachix.org-1:naAvMrz0CuYqeyGNyLgE010iUiuf/qx6kYrUv3NwAJ8=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" - "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" - ]; - }; - }; -} diff --git a/wanda/programs/nh.nix b/wanda/programs/nh.nix deleted file mode 100644 index 6d9937d..0000000 --- a/wanda/programs/nh.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - programs = { - nh = { - enable = true; - clean = { - enable = true; - dates = "weekly"; - extraArgs = "--keep 2 --keep-since 2d"; - }; - }; - }; -} diff --git a/wanda/programs/ssh.nix b/wanda/programs/ssh.nix deleted file mode 100644 index 017f4c9..0000000 --- a/wanda/programs/ssh.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - programs = { - ssh = { - startAgent = true; - agentTimeout = "12h"; - }; - }; -} diff --git a/wanda/security/rtkit.nix b/wanda/security/rtkit.nix deleted file mode 100644 index dd40f89..0000000 --- a/wanda/security/rtkit.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - security = { - rtkit = { - enable = true; - }; - }; -} diff --git a/wanda/security/sudo-rs.nix b/wanda/security/sudo-rs.nix deleted file mode 100644 index 4f270c9..0000000 --- a/wanda/security/sudo-rs.nix +++ /dev/null @@ -1,9 +0,0 @@ -_: { - security = { - sudo-rs = { - enable = true; - wheelNeedsPassword = true; - execWheelOnly = true; - }; - }; -} diff --git a/wanda/security/sudo.nix b/wanda/security/sudo.nix deleted file mode 100644 index 393528d..0000000 --- a/wanda/security/sudo.nix +++ /dev/null @@ -1,7 +0,0 @@ -{lib, ...}: { - security = { - sudo = { - enable = lib.mkDefault false; - }; - }; -} diff --git a/wanda/services/greetd.nix b/wanda/services/greetd.nix deleted file mode 100644 index 83d2431..0000000 --- a/wanda/services/greetd.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - services = { - greetd = { - enable = true; - restart = false; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} -r -t -c ${lib.getExe' pkgs.hyprland "start-hyprland"} --greet-align center"; - user = "greeter"; - }; - }; - }; - }; -} diff --git a/wanda/services/libinput.nix b/wanda/services/libinput.nix deleted file mode 100644 index 23c2953..0000000 --- a/wanda/services/libinput.nix +++ /dev/null @@ -1,15 +0,0 @@ -_: { - services = { - libinput = { - enable = true; - mouse = { - accelProfile = "flat"; - accelSpeed = "-1.0"; - buttonMapping = "1 2 3 4 5 6 7 8 9"; - horizontalScrolling = true; - leftHanded = false; - naturalScrolling = true; - }; - }; - }; -} diff --git a/wanda/services/qmk.nix b/wanda/services/qmk.nix deleted file mode 100644 index d193c5d..0000000 --- a/wanda/services/qmk.nix +++ /dev/null @@ -1,9 +0,0 @@ -{pkgs, ...}: { - services = { - udev = { - packages = with pkgs; [ - qmk-udev-rules - ]; - }; - }; -} diff --git a/wanda/services/usbmuxd.nix b/wanda/services/usbmuxd.nix deleted file mode 100644 index 34606ed..0000000 --- a/wanda/services/usbmuxd.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - services = { - usbmuxd = { - enable = true; - package = pkgs.usbmuxd2; - }; - }; -} diff --git a/wanda/services/xserver.nix b/wanda/services/xserver.nix deleted file mode 100644 index 370a47d..0000000 --- a/wanda/services/xserver.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - services = { - xserver = { - display = lib.mkForce 0; - enable = true; - - excludePackages = with pkgs; [ - xterm - ]; - - videoDrivers = [ - "modesetting" - ]; - - xkb = { - layout = "us, ru"; - variant = ""; - options = "grp:caps_toggle"; - }; - }; - }; -} diff --git a/wanda/services/yubikey-agent.nix b/wanda/services/yubikey-agent.nix deleted file mode 100644 index 4fcfbc2..0000000 --- a/wanda/services/yubikey-agent.nix +++ /dev/null @@ -1,8 +0,0 @@ -{pkgs, ...}: { - services = { - yubikey-agent = { - package = pkgs.yubikey-agent; - enable = false; - }; - }; -} diff --git a/wanda/system/name.nix b/wanda/system/name.nix deleted file mode 100644 index 0b4488b..0000000 --- a/wanda/system/name.nix +++ /dev/null @@ -1,5 +0,0 @@ -{config, ...}: { - system = { - name = config.networking.hostName; - }; -} diff --git a/wanda/system/stateVersion.nix b/wanda/system/stateVersion.nix deleted file mode 100644 index 9e437fe..0000000 --- a/wanda/system/stateVersion.nix +++ /dev/null @@ -1,5 +0,0 @@ -{config, ...}: { - system = { - stateVersion = config.system.nixos.release; - }; -} diff --git a/wanda/systemd/oomd.nix b/wanda/systemd/oomd.nix deleted file mode 100644 index bb9a200..0000000 --- a/wanda/systemd/oomd.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - systemd = { - oomd = { - enable = true; - enableUserSlices = true; - enableSystemSlice = true; - enableRootSlice = true; - }; - }; -} diff --git a/wanda/systemd/slices/user-slice.nix b/wanda/systemd/slices/user-slice.nix deleted file mode 100644 index 311e668..0000000 --- a/wanda/systemd/slices/user-slice.nix +++ /dev/null @@ -1,14 +0,0 @@ -_: { - systemd = { - slices = { - user = { - sliceConfig = { - ManagedOOMSwap = "kill"; - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "40%"; - ManagedOOMMemoryPressureDurationSec = 0; - }; - }; - }; - }; -} diff --git a/wanda/time/timeZone.nix b/wanda/time/timeZone.nix deleted file mode 100644 index cef1656..0000000 --- a/wanda/time/timeZone.nix +++ /dev/null @@ -1,6 +0,0 @@ -_: { - time = { - timeZone = "Europe/Moscow"; - hardwareClockInLocalTime = true; - }; -} diff --git a/wanda/users/mutableUsers.nix b/wanda/users/mutableUsers.nix deleted file mode 100644 index 9bb56d0..0000000 --- a/wanda/users/mutableUsers.nix +++ /dev/null @@ -1,5 +0,0 @@ -_: { - users = { - mutableUsers = false; - }; -} diff --git a/wanda/users/users/hand7s.nix b/wanda/users/users/hand7s.nix deleted file mode 100644 index 39aed35..0000000 --- a/wanda/users/users/hand7s.nix +++ /dev/null @@ -1,15 +0,0 @@ -_: { - users = { - users = { - "hand7s" = { - description = "me"; - isSystemUser = false; - isNormalUser = true; - initialHashedPassword = "$6$ckgRhNWmJgSwOUpJ$kfeAdokd5fa76HWbTmWN2YXx4M/PQVOTJku1ODbqbBhEkUFiLftdaJFRnNXfIM3Jtz0ShoRMSVCB7mDkxDrdi/"; - extraGroups = [ - "wheel" - ]; - }; - }; - }; -} diff --git a/wanda/wsl/default.nix b/wanda/wsl/default.nix deleted file mode 100644 index aded930..0000000 --- a/wanda/wsl/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - wsl = { - enable = true; - defaultUser = "hand7s"; - startMenuLaunchers = true; - useWindowsDriver = true; - }; -} diff --git a/wanda/wsl/wslConf.nix b/wanda/wsl/wslConf.nix deleted file mode 100644 index 43f3877..0000000 --- a/wanda/wsl/wslConf.nix +++ /dev/null @@ -1,13 +0,0 @@ -_: { - wsl = { - wslConf = { - automount = { - enable = true; - }; - - user = { - default = "hand7s"; - }; - }; - }; -} diff --git a/wanda/xdg/portal.nix b/wanda/xdg/portal.nix deleted file mode 100644 index ff26e0a..0000000 --- a/wanda/xdg/portal.nix +++ /dev/null @@ -1,35 +0,0 @@ -{pkgs, ...}: { - xdg = { - portal = { - enable = true; - - config = { - common = { - "org.freedesktop.impl.portal.FileChooser" = "termfilechooser"; - - default = [ - "gtk" - ]; - }; - - hyprland = { - "org.freedesktop.impl.portal.FileChooser" = [ - "termfilechooser" - ]; - - preferred = [ - "gtk" - "hyprland" - ]; - }; - }; - - extraPortals = with pkgs; [ - xdg-desktop-portal - xdg-desktop-portal-gtk - xdg-desktop-portal-hyprland - xdg-desktop-portal-termfilechooser - ]; - }; - }; -}