diff --git a/disko/EDI/default.nix b/disko/EDI/default.nix index 6fe0e0a..1c2ab31 100644 --- a/disko/EDI/default.nix +++ b/disko/EDI/default.nix @@ -57,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "ext4"; + format = "bcachefs"; mountpoint = "/"; mountOptions = [ "defaults" diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index c605347..53ffd96 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -41,23 +41,6 @@ }; }; }; - #sdc = { - #device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2"; - #type = "disk"; - #content = { - #type = "gpt"; - #partitions = { - #root = { - #size = "100%"; - #content = { - #type = "filesystem"; - #format = "ext4"; - #mountpoint = "/media"; - #}; - #}; - #}; - #}; - #}; }; lvm_vg = { pool = { @@ -74,7 +57,7 @@ size = "100%FREE"; content = { type = "filesystem"; - format = "ext4"; + format = "bcachefs"; mountpoint = "/"; mountOptions = [ "defaults" diff --git a/disko/wheatley/default.nix b/disko/wheatley/default.nix deleted file mode 100644 index 0e892ff..0000000 --- a/disko/wheatley/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - disko = { - devices = { - disk = { - disk1 = { - imageSize = "20G"; - type = "disk"; - device = "/dev/mmcblk0"; - content = { - type = "gpt"; - partitions = { - firmware = { - size = "30M"; - priority = 1; - type = "0700"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/firmware"; - }; - }; - boot = { - size = "1G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - extraArgs = []; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/flake.lock b/flake.lock index 3ff51c0..4c5c137 100644 --- a/flake.lock +++ b/flake.lock @@ -1,92 +1,70 @@ { "nodes": { - "base16": { + "attic": { "inputs": { - "fromYaml": "fromYaml" + "crane": "crane_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "type": "github" }, "original": { - "owner": "SenchoPens", - "repo": "base16.nix", + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", "type": "github" } }, - "base16-fish": { - "flake": false, + "attic_2": { + "inputs": { + "crane": "crane_4", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable_2" + }, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "type": "github" }, "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "owner": "zhaofengli", + "ref": "main", + "repo": "attic", "type": "github" } }, "bcachefs-tools": { "inputs": { "crane": "crane", + "fenix": "fenix", "flake-compat": "flake-compat", "flake-parts": [ "flake-parts" ], - "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748210385, - "narHash": "sha256-kGicDnV0l1D2TtBbLBwoiZq7xTlON2nq10GAhnGL3mY=", + "lastModified": 1718420836, + "narHash": "sha256-yQA+E+KpX2TwkF2t+XHuhm0TH6auIznJsaiZUiRGTyk=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "6cb4160e0c1de2562b40f30206f80f96303c1ee8", + "rev": "2af260ab2b0f0ad4271fa5c987906fa324655425", "type": "github" }, "original": { @@ -111,16 +89,35 @@ "type": "gitlab" } }, - "catppuccin": { + "cachix": { "inputs": { - "nixpkgs": "nixpkgs" + "devenv": "devenv", + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1748080874, - "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=", + "lastModified": 1717420532, + "narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", + "owner": "cachix", + "repo": "cachix", + "rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "master", + "repo": "cachix", + "type": "github" + } + }, + "catppuccin": { + "locked": { + "lastModified": 1718339789, + "narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=", "owner": "catppuccin", "repo": "nix", - "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112", + "rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a", "type": "github" }, "original": { @@ -129,13 +126,107 @@ "type": "github" } }, - "crane": { + "complement": { + "flake": false, "locked": { - "lastModified": 1742394900, - "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "owner": "matrix-org", + "repo": "complement", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "complement_2": { + "flake": false, + "locked": { + "lastModified": 1715700731, + "narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", + "owner": "matrix-org", + "repo": "complement", + "rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", + "type": "github" + }, + "original": { + "owner": "matrix-org", + "ref": "main", + "repo": "complement", + "type": "github" + } + }, + "conduit": { + "inputs": { + "attic": "attic", + "complement": "complement", + "crane": "crane_3", + "fenix": "fenix_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_2", + "rocksdb": "rocksdb" + }, + "locked": { + "lastModified": 1715983991, + "narHash": "sha256-2OL8zPpDHXgOxNqXlWqd1aJ2uZJCAuoqBWaabwWUg2M=", + "path": "/nix/store/2h6yxx9z1if5pqwsr7m6pr07h8i498qz-source", + "rev": "8bffcfe82b3cc50bb095f41afc585fabacb963e3", + "type": "path" + }, + "original": { + "id": "conduit", + "type": "indirect" + } + }, + "conduwuit": { + "inputs": { + "attic": "attic_2", + "cachix": "cachix", + "complement": "complement_2", + "crane": "crane_5", + "fenix": "fenix_3", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_6", + "liburing": "liburing", + "nix-filter": "nix-filter_2", + "nixpkgs": [ + "nixpkgs" + ], + "rocksdb": "rocksdb_2" + }, + "locked": { + "lastModified": 1718590227, + "narHash": "sha256-IFtAtsGx0kPg8ONpV742SToDZ1IkuAHS1TOO0Sny1vw=", + "owner": "girlbossceo", + "repo": "conduwuit", + "rev": "8affdc43a677cf51f04dc16a36978e5adde12fb3", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "repo": "conduwuit", + "type": "github" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "bcachefs-tools", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { @@ -145,12 +236,19 @@ } }, "crane_2": { + "inputs": { + "nixpkgs": [ + "conduit", + "attic", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", "type": "github" }, "original": { @@ -160,12 +258,41 @@ } }, "crane_3": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1743700120, - "narHash": "sha256-8BjG/P0xnuCyVOXlYRwdI1B8nVtyYLf3oDwPSimqREY=", + "lastModified": 1715274763, + "narHash": "sha256-3Iv1PGHJn9sV3HO4FlOVaaztOxa9uGLfOmUWrH7v7+A=", "owner": "ipetkov", "repo": "crane", - "rev": "e316f19ee058e6db50075115783be57ac549c389", + "rev": "27025ab71bdca30e7ed0a16c88fd74c5970fc7f5", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_4": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", "type": "github" }, "original": { @@ -174,6 +301,101 @@ "type": "github" } }, + "crane_5": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716569590, + "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "109987da061a1bf452f435f1653c47511587d919", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "ref": "master", + "repo": "crane", + "type": "github" + } + }, + "crane_6": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "owner": "ipetkov", + "repo": "crane", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_7": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718730147, + "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "owner": "ipetkov", + "repo": "crane", + "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "devenv": { + "inputs": { + "flake-compat": [ + "conduwuit", + "cachix", + "flake-compat" + ], + "nix": "nix", + "nixpkgs": "nixpkgs_4", + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "conduwuit", + "cachix", + "pre-commit-hooks" + ] + }, + "locked": { + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "owner": "cachix", + "repo": "devenv", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "python-rewrite", + "repo": "devenv", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -181,11 +403,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -194,30 +416,98 @@ "type": "github" } }, - "firefox-gnome-theme": { - "flake": false, + "fenix": { + "inputs": { + "nixpkgs": [ + "bcachefs-tools", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "lastModified": 1717827974, + "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8", "type": "github" }, "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "conduit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1715322226, + "narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", + "owner": "nix-community", + "repo": "fenix", + "rev": "297c756ba6249d483c1dafe42378560458842173", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", + "type": "github" + } + }, + "fenix_3": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_3" + }, + "locked": { + "lastModified": 1716359173, + "narHash": "sha256-pYcjP6Gy7i6jPWrjiWAVV0BCQp+DdmGaI/k65lBb/kM=", + "owner": "nix-community", + "repo": "fenix", + "rev": "b6fc5035b28e36a98370d0eac44f4ef3fd323df6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "fenix", "type": "github" } }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_10": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -229,11 +519,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -245,11 +535,28 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -258,13 +565,79 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { + "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_7": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "ref": "master", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -280,11 +653,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -301,32 +674,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -336,15 +688,12 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -354,15 +703,67 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { "systems": "systems_3" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -371,75 +772,103 @@ "type": "github" } }, - "fromYaml": { - "flake": false, + "flake-utils_6": { + "inputs": { + "systems": "systems_4" + }, "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { - "owner": "SenchoPens", - "repo": "fromYaml", + "owner": "numtide", + "ref": "main", + "repo": "flake-utils", "type": "github" } }, - "git-hooks": { + "flake-utils_7": { "inputs": { - "flake-compat": [ - "simple-nixos-mailserver", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "simple-nixos-mailserver", - "nixpkgs" - ] + "systems": "systems_5" }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, - "git-hooks_2": { + "flake-utils_8": { "inputs": { - "flake-compat": [ - "stylix", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "stylix", - "nixpkgs" - ] + "systems": "systems_6" }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { - "owner": "cachix", - "repo": "git-hooks.nix", + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "conduwuit", + "cachix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -461,67 +890,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "simple-nixos-mailserver", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "stylix", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "48.1", - "repo": "gnome-shell", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -529,11 +897,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1718983978, + "narHash": "sha256-lp6stESwTLBZUQ5GBivxwNehShmBp4jqeX/1xahM61w=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "c559542f0aa87971a7f4c1b3478fe33cc904b902", "type": "github" }, "original": { @@ -543,38 +911,17 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1747990026, - "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", + "lastModified": 1718977552, + "narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", + "rev": "a7a9774538612c75324f785ab1300e67abc039d3", "type": "github" }, "original": { @@ -585,19 +932,20 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", + "crane": "crane_6", + "flake-compat": "flake-compat_9", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747056319, - "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", + "lastModified": 1718782018, + "narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", + "rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "type": "github" }, "original": { @@ -606,19 +954,97 @@ "type": "github" } }, + "liburing": { + "flake": false, + "locked": { + "lastModified": 1716565485, + "narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", + "owner": "axboe", + "repo": "liburing", + "rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", + "type": "github" + }, + "original": { + "owner": "axboe", + "ref": "master", + "repo": "liburing", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1708577783, + "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", + "owner": "domenkozar", + "repo": "nix", + "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "main", + "repo": "nix-filter", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ - "bcachefs-tools", + "conduwuit", + "cachix", + "devenv", + "poetry2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1737420293, - "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", "type": "github" }, "original": { @@ -635,11 +1061,11 @@ ] }, "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", "type": "github" }, "original": { @@ -656,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1748145500, - "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", + "lastModified": 1718507237, + "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", + "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "type": "github" }, "original": { @@ -671,11 +1097,11 @@ }, "nixlib": { "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -692,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1747663185, - "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -707,11 +1133,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1718987887, + "narHash": "sha256-zVoDb0GkhdfrRtJbJm3QIwFAyZEv9ZBo23vfPa5cfjk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "cc634b69c8312c4e88469d3c7e8fb5ecc72e7dc6", "type": "github" }, "original": { @@ -723,43 +1149,42 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-25_05": { + "nixpkgs-24_05": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" } }, "nixpkgs-edge": { "locked": { - "lastModified": 1748357078, - "narHash": "sha256-H43F25mYtaF23FEF8Jf+6KNQ6yGoX1mSLmqxKcAn5dg=", + "lastModified": 1719005338, + "narHash": "sha256-aIf2t5Y3/jeoZrpPYt+Zd/4b0l1k1MY9/fTstoduiw8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33ceef1505f9f741e3c117e6723446eecf027a63", + "rev": "69802c3649709bf4c464daa89471ea32036f55d8", "type": "github" }, "original": { @@ -768,13 +1193,109 @@ "type": "indirect" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_5": { + "locked": { + "lastModified": 1718478900, + "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c884223af91820615a6146af1ae1fea25c107005", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -784,13 +1305,45 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_10": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1718276985, + "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1718742829, + "narHash": "sha256-+H7PnuwEDDDxUMa3ItAcSRDK5+jfMJap/zHiuACyIfc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "37a45fb6993f14555f50b18fbcf4945b82a35707", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -802,43 +1355,43 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746916775, - "narHash": "sha256-TGHTAbjauY7kK8tX8HdFh0A9eXhiRIbwZH6vBHLsofc=", + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fb53a7bf9a07f97c34910aa45388083c67751e9", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -850,27 +1403,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -880,48 +1417,53 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1718541509, + "narHash": "sha256-TmC5TxW5WPAfmovDzi1hLe1i4qqND79s9SH9UOKcSvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "ba06293cdba1c94af9710024abf3b94cf8d76349", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, + "nixpkgs_8": { "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", - "owner": "nix-community", - "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "NUR", + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -932,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1748196248, - "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=", + "lastModified": 1718956312, + "narHash": "sha256-iH+ilQbskYuwoOgN1w3sTgkEcVuuFPIJZ1HCGdgeh70=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b7697abe89967839b273a863a3805345ea54ab56", + "rev": "6f182700ad78f13f367fdfff2b0a4062e70eeea8", "type": "github" }, "original": { @@ -945,24 +1487,76 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_4", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "conduwuit", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore", + "nixpkgs": [ + "conduwuit", + "cachix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1715609711, + "narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "c182c876690380f8d3b9557c4609472ebfa1b141", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" - ] + ], + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { @@ -971,42 +1565,132 @@ "type": "github" } }, + "rocksdb": { + "flake": false, + "locked": { + "lastModified": 1714770052, + "narHash": "sha256-NCPYF2wYBsB9OHEkZSOYoPlxjC9BBMhJp8EM5M1o3Mc=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "db6df0b185774778457dabfcbd822cb81760cade", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.1.1", + "repo": "rocksdb", + "type": "github" + } + }, + "rocksdb_2": { + "flake": false, + "locked": { + "lastModified": 1716773462, + "narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", + "owner": "girlbossceo", + "repo": "rocksdb", + "rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", + "type": "github" + }, + "original": { + "owner": "girlbossceo", + "ref": "v9.2.1", + "repo": "rocksdb", + "type": "github" + } + }, "root": { "inputs": { "bcachefs-tools": "bcachefs-tools", "catppuccin": "catppuccin", + "conduit": "conduit", + "conduwuit": "conduwuit", "disko": "disko", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_7", "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", "nix-index-database": "nix-index-database", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_8", "nixpkgs-edge": "nixpkgs-edge", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", - "stylix": "stylix", "zjstatus": "zjstatus" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1717583671, + "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "48bbdd6a74f3176987d5c809894ac33957000d19", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1715255944, + "narHash": "sha256-vLLgYpdtKBaGYTamNLg1rbRo1bPXp4Jgded/gnprPVw=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "5bf2f85c8054d80424899fa581db1b192230efb5", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-analyzer-src_3": { + "flake": false, + "locked": { + "lastModified": 1716107283, + "narHash": "sha256-NJgrwLiLGHDrCia5AeIvZUHUY7xYGVryee0/9D3Ir1I=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "21ec8f523812b88418b2bfc64240c62b3dd967bd", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], "nixpkgs": [ - "bcachefs-tools", + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1742524367, - "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=", + "lastModified": 1718504420, + "narHash": "sha256-F2HT/abCfr0CDpkvXwYCscJyD66XDTLMVfdrIMRp2ck=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "70bf752d176b2ce07417e346d85486acea9040ef", + "rev": "0043c3f92304823cc2c0a4354b0feaa61dfb4cd9", "type": "github" }, "original": { @@ -1016,27 +1700,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747017456, - "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5b07506ae89b025b14de91f697eba23b48654c52", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "zjstatus", @@ -1044,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1743682350, - "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", + "lastModified": 1718849885, + "narHash": "sha256-Qfc5HKpQvGhWXox0WJVzLqrAcFm3uy6xtWRvVmrkLYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", + "rev": "bc1a236757cd5f6622f73838e551fb2035afa44a", "type": "github" }, "original": { @@ -1060,17 +1723,16 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_5", - "nixpkgs-25_05": "nixpkgs-25_05" + "flake-compat": "flake-compat_10", + "nixpkgs": "nixpkgs_9", + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1718697807, + "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b", "type": "gitlab" }, "original": { @@ -1082,14 +1744,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1718506969, + "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251", "type": "github" }, "original": { @@ -1098,41 +1761,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", - "git-hooks": "git-hooks_2", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7", - "nur": "nur", - "systems": "systems_2", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": "tinted-schemes", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1748276618, - "narHash": "sha256-reC7nvUfJMaIYJb5pVOuTFbOfj/L9eo21drj+9EbrkE=", - "owner": "danth", - "repo": "stylix", - "rev": "1fdbf01ebe4b7838aa3d95334325ce8445625332", - "type": "github" - }, - "original": { - "owner": "danth", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1178,84 +1806,63 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, + "systems_4": { "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "tinted-kitty": { - "flake": false, + "systems_5": { "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "tinted-schemes": { - "flake": false, + "systems_6": { "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "tinted-theming", - "repo": "schemes", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "tinted-tmux": { - "flake": false, + "systems_7": { "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1725758778, - "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, @@ -1267,33 +1874,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { @@ -1304,17 +1889,17 @@ }, "zjstatus": { "inputs": { - "crane": "crane_3", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_8", - "rust-overlay": "rust-overlay_3" + "crane": "crane_7", + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_11", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745230073, - "narHash": "sha256-OER99U7MiqQ47myvbsiljsax7OsK19NMds4NBM9XXLs=", + "lastModified": 1718908642, + "narHash": "sha256-BmPjWXBc5lZKOlyo5unG5BgS2f97O6+nVnu/yZESPIs=", "owner": "dj95", "repo": "zjstatus", - "rev": "a819e3bfe6bfef0438d811cdbb1bcfdc29912c62", + "rev": "5dea90349c6366383ecda9a1b9bf3e321824a5c6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9382a34..065ea9a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,11 +13,11 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; - # bcachefs-tools = { - # url = "github:koverstreet/bcachefs-tools"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.flake-parts.follows = "flake-parts"; - # }; + bcachefs-tools = { + url = "github:koverstreet/bcachefs-tools"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-parts.follows = "flake-parts"; + }; flake-parts = { url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management @@ -33,7 +33,11 @@ # catpuccin theme catppuccin.url = "github:catppuccin/nix"; - # Conduwuit fork after it shut down + # Conduit fork without all the fuss and drama + conduwuit = { + url = "github:girlbossceo/conduwuit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Nix index database files nix-index-database.url = "github:nix-community/nix-index-database"; @@ -74,14 +78,25 @@ # Add any other flake you might need # hardware.url = "github:nixos/nixos-hardware"; - # Stylix theming engine - stylix.url = "github:danth/stylix"; + }; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://0uptime.cachix.org" + "https://cache.lix.systems" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + ]; }; outputs = { self, nixpkgs, - flake-utils, nixpkgs-edge, nixos-generators, catppuccin, @@ -95,21 +110,14 @@ jovian, nixos-hardware, nix-index-database, - stylix, + conduit, ... } @ inputs: let - supportedSystems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; - forEachSupportedSystem = f: - nixpkgs.lib.genAttrs supportedSystems (system: - f { - pkgs = import nixpkgs {inherit system;}; - }); inherit (self) outputs; inherit (inputs) nixpkgs-edge; # Supported systems for your flake packages, shell, etc. systems = [ "x86_64-linux" - "aarch64-linux" ]; # This is a function that generates an attribute by calling a function you # pass to it, with each system as an argument @@ -121,41 +129,7 @@ allowUnfreePredicate = _: true; }; }; - - sharedModules = [ - ./nixos/shared - sops-nix.nixosModules.sops - disko.nixosModules.disko - home-manager.nixosModules.home-manager - catppuccin.nixosModules.catppuccin - stylix.nixosModules.stylix - nix-index-database.nixosModules.nix-index - {programs.nix-index-database.comma.enable = true;} - { - home-manager.sharedModules = [ - catppuccin.homeModules.catppuccin - ./home-manager/shared - sops-nix.homeManagerModules.sops - ]; - } - ]; - - desktopModules = [ - ./nixos/desktop - { - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - ./home-manager/desktop - ]; - } - ]; in { - devShells = forEachSupportedSystem ({pkgs}: { - default = pkgs.mkShell { - packages = with pkgs; [nom just git]; - }; - }); - # Your custom packages # Accessible through 'nix build', 'nix shell', etc packages = forAllSystems (system: @@ -172,7 +146,7 @@ nixosModules = import ./modules/nixos; # Reusable home-manager modules you might want to export # These are usually stuff you would upstream into home-manager - # homeManagerModules = import ./modules/home-manager; + homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; @@ -183,73 +157,128 @@ EDI = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ desktopModules - ++ [ - {_module.args = {inherit pkgs-edge;};} - nixos-hardware.nixosModules.dell-xps-13-7390 - lanzaboote.nixosModules.lanzaboote - # > Our main nixos configuration file < - ./nixos/hosts/EDI/configuration.nix - ]; + modules = [ + {_module.args = {inherit pkgs-edge;};} + nixos-hardware.nixosModules.dell-xps-13-7390 + # > Our main nixos configuration file < + ./nixos/hosts/EDI/configuration.nix + sops-nix.nixosModules.sops + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; + } + ]; }; GLaDOS = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ desktopModules - ++ [ - {_module.args = {inherit pkgs-edge;};} - jovian.nixosModules.jovian - # > Our main nixos configuration file < - ./nixos/hosts/GLaDOS/configuration.nix - lanzaboote.nixosModules.lanzaboote - ]; + modules = [ + {_module.args = {inherit pkgs-edge;};} + # > Our main nixos configuration file < + ./nixos/hosts/GLaDOS/configuration.nix + sops-nix.nixosModules.sops + #lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + inputs.plasma-manager.homeManagerModules.plasma-manager + ]; + } + ]; }; queen = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ [ - {_module.args = {inherit pkgs-edge;};} - simple-nixos-mailserver.nixosModule - # > Our main nixos configuration file < - ./nixos/hosts/queen/configuration.nix - ]; + modules = [ + {_module.args = {inherit pkgs-edge;};} + # > Our main nixos configuration file < + ./nixos/hosts/queen/configuration.nix + sops-nix.nixosModules.sops + disko.nixosModules.disko + simple-nixos-mailserver.nixosModule + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } + ]; }; shodan = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ [ - {_module.args = {inherit pkgs-edge;};} - # > Our main nixos configuration file < - ./nixos/hosts/shodan/configuration.nix - lanzaboote.nixosModules.lanzaboote - jovian.nixosModules.jovian - { - home-manager.sharedModules = [ - inputs.plasma-manager.homeManagerModules.plasma-manager - ]; - } - ]; + modules = [ + {_module.args = {inherit pkgs-edge;};} + # > Our main nixos configuration file < + ./nixos/hosts/shodan/configuration.nix + sops-nix.nixosModules.sops + lanzaboote.nixosModules.lanzaboote + disko.nixosModules.disko + jovian.nixosModules.jovian + home-manager.nixosModules.home-manager + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } + ]; }; - wheatley = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; + ISO = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; - modules = - sharedModules - ++ [ - ./nixos/hosts/wheatley/configuration.nix - ]; + modules = [ + {_module.args = {inherit pkgs-edge;};} + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + ./nixos/hosts/iso/configuration.nix + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.plasma-manager.homeManagerModules.plasma-manager + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } + ]; + }; + + iso_server = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = [ + {_module.args = {inherit pkgs-edge;};} + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" + "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" + ./nixos/hosts/iso_server/configuration.nix + sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager + nix-index-database.nixosModules.nix-index + catppuccin.nixosModules.catppuccin + { + home-manager.sharedModules = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + } + ]; }; }; }; diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 904ec83..088d5ca 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.nix @@ -1,6 +1,9 @@ { - pkgs, + inputs, + outputs, + lib, config, + pkgs, ... }: { # You can import other home-manager modules here @@ -17,8 +20,6 @@ ./package-configs/firefox.nix ./package-configs/konsole ./package-configs/foot - ./package-configs/freetube - ./package-configs/vesktop ]; nixpkgs = { # You can add overlays here @@ -32,240 +33,174 @@ # patches = [ ./change-hello-to-hi.patch ]; # }); # }) - # (final: prev: { - # catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { - # accent = "mauve"; - # boldKeywords = true; - # italicComments = true; - # italicKeywords = true; - # extraBordersEnabled = false; - # workbenchMode = "default"; - # bracketMode = "rainbow"; - # colorOverrides = {}; - # customUIColors = {}; - # }); - # }) - # (final: prev: { - # catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { - # accent = "mauve"; - # boldKeywords = true; - # italicComments = true; - # italicKeywords = true; - # extraBordersEnabled = false; - # workbenchMode = "default"; - # bracketMode = "rainbow"; - # colorOverrides = {}; - # customUIColors = {}; - # }); - # }) + (final: prev: { + catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + accent = "mauve"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "default"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }); + }) + (final: prev: { + catppuccin-vsc = final.catppuccin-vsc.overrideAttrs (oldAttrs: { + accent = "mauve"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "default"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }); + }) ]; + # Configure your nixpkgs instance config = { - permittedInsecurePackages = ["cinny-4.2.3" "cinny-unwrapped-4.2.3" "cinny-4.2.2" "cinny-unwrapped-4.2.2"]; - # Configure your nixpkgs instance - # Disable if you don't want unfree packages allowUnfree = true; }; }; - systemd.user = { - # services."nextcloud-autosync@" = { - # Unit = { - # Description = "Auto sync Nextcloud"; - # After = "network-online.target"; - # PartOf = ["nextcloud-autosyncs.target"]; - # }; - # Service = { - # Type = "simple"; - # ExecStart = "${pkgs.nextcloud-client}/bin/nextcloudcmd -h -n --path /%i /home/lillian/%i https://nextcloud.gladtherescake.eu"; - # TimeoutStopSec = "180"; - # KillMode = "process"; - # KillSignal = "SIGINT"; - # }; - # Install.WantedBy = ["multi-user.target"]; - # }; - # targets.nextcloud-autosyncs = { - # Unit = { - # Description = "workers"; - # Requires = ["nextcloud-autosync@Music" "nextcloud-autosync@Pictures" "nextcloud-autosync@Scripts" "nextcloud-autosync@Videos" "nextcloud-autosync@Documents"]; - # PartOf = "nextcloud-autosyncs.target"; - # }; - # Install.WantedBy = ["multi-user.target"]; - # }; - # timers.nextcloud-autosyncs = { - # Unit.Description = "Automatic sync files with Nextcloud when booted up after 5 minutes then rerun every 60 minutes"; - # Timer.OnBootSec = "5min"; - # Timer.OnUnitActiveSec = "60min"; - # Install.WantedBy = ["multi-user.target" "timers.target"]; - # }; - - # Nicely reload system units when changing configs - startServices = "sd-switch"; - }; home = { username = "lillian"; homeDirectory = "/home/lillian"; + }; - file = { - Music = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Music"; - target = "Music"; - }; - Pictures = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Pictures"; - target = "Pictures"; - }; - Screenshots = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Pictures/Screenshots"; - target = "Screenshots"; - }; - Scripts = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Scripts"; - target = "Scripts"; - }; - Videos = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Videos"; - target = "Videos"; - }; - Documents = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Documents"; - target = "Documents"; - }; - floorp = { - source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/.mozilla/firefox"; - target = ".floorp"; - }; - }; + # Add stuff for your user as you see fit: + # programs.neovim.enable = true; + # home.packages = with pkgs; [ steam ]; - # Add stuff for your user as you see fit: - # programs.neovim.enable = true; - # home.packages = with pkgs; [ steam ]; + home.packages = with pkgs; [ + # Coding: + direnv + git + git-credential-manager + git-credential-manager + ruff + kate - packages = with pkgs; [ - # Coding: - direnv - git - git-credential-manager - git-credential-manager - ruff - devtoolbox + # Chat applications: + signal-desktop + webcord-vencord - # Chat applications: - signal-desktop - vesktop - cinny-desktop + # Gaming: + prismlauncher + steam - # Gaming: - prismlauncher - steam - gamescope + # Multimedia: + freetube + vlc - # Multimedia: - vlc - fcast-receiver - fcast-client + # Office applications: + onlyoffice-bin + gimp + thunderbird - # Office applications: - onlyoffice-bin - gimp - thunderbird + # System tools: + rage + flameshot + fzf + nextcloud-client + nitrokey-app + protonvpn-gui + virtualbox + watchmate + qbittorrent - # System tools: - rage - flameshot - fzf - nextcloud-client - nitrokey-app - # protonvpn-gui - virtualbox - #watchmate - qbittorrent + # Theming: + catppuccin-cursors + (catppuccin-kde.override { + flavour = ["macchiato"]; + accents = ["mauve"]; + }) + catppuccin-sddm-corners - # Theming: - catppuccin-cursors - (catppuccin-kde.override { - flavour = ["macchiato"]; - accents = ["mauve"]; - }) - catppuccin-sddm-corners + # Theming: + catppuccin-cursors + (catppuccin-kde.override { + flavour = ["macchiato"]; + accents = ["mauve"]; + }) + catppuccin-sddm-corners - # Theming: - catppuccin-cursors - (catppuccin-kde.override { - flavour = ["macchiato"]; - accents = ["mauve"]; - }) - catppuccin-sddm-corners + # Web browsing: + firefoxpwa + firefoxpwa + ungoogled-chromium + ]; - # Web browsing: - firefoxpwa - firefoxpwa - ungoogled-chromium + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + charliermarsh.ruff + eamodio.gitlens + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + mkhl.direnv + ms-toolsai.jupyter + ms-pyright.pyright + ms-python.black-formatter + ms-python.vscode-pylance + ms-vscode-remote.remote-ssh + oderwat.indent-rainbow + rust-lang.rust-analyzer + yzhang.markdown-all-in-one ]; }; - programs = { - # vscode = { - # enable = true; - # package = pkgs.vscodium; - # extensions = with pkgs.vscode-extensions; [ - # catppuccin.catppuccin-vsc - # catppuccin.catppuccin-vsc-icons - # charliermarsh.ruff - # eamodio.gitlens - # github.vscode-pull-request-github - # jnoortheen.nix-ide - # kamadorueda.alejandra - # mkhl.direnv - # ms-toolsai.jupyter - # ms-pyright.pyright - # oderwat.indent-rainbow - # rust-lang.rust-analyzer - # yzhang.markdown-all-in-one - # ]; - # }; - obs-studio.enable = true; - obs-studio.plugins = with pkgs.obs-studio-plugins; [ + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-backgroundremoval obs-pipewire-audio-capture ]; + }; - # Enable home-manager and git - home-manager.enable = true; - git = { - enable = true; - userEmail = "git@lillianviolet.dev"; - userName = "Lillian-Violet"; - extraConfig = { - init = { - defaultBranch = "main"; - }; + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@lillianviolet.dev"; + userName = "Lillian-Violet"; + extraConfig = { + init = { + defaultBranch = "main"; }; - ignores = [ - "*.direnv" - "*.vscode" - ".envrc" - "venv" - "venv" - ]; - signing.format = "ssh"; }; + ignores = [ + "*.direnv" + "*.vscode" + ".envrc" + "venv" + "venv" + ]; + }; - gpg.enable = true; - gpg.settings = { - default-key = "0d43 5407 034c 2ad9 2d42 799d 280e 061d ff60 0f0d"; - default-recipient-self = true; - auto-key-locate = "local,wkd,keyserver"; - keyserver = "hkps://keys.openpgp.org"; - auto-key-retrieve = true; - auto-key-import = true; - keyserver-options = "honor-keyserver-url"; - no-autostart = true; - }; - }; - services = { - kdeconnect.package = pkgs.kdePackages.kdeconnect-kde; - kdeconnect.enable = true; + programs.gpg.enable = true; + programs.gpg.settings = { + default-key = "0d43 5407 034c 2ad9 2d42 799d 280e 061d ff60 0f0d"; + default-recipient-self = true; + auto-key-locate = "local,wkd,keyserver"; + keyserver = "hkps://keys.openpgp.org"; + auto-key-retrieve = true; + auto-key-import = true; + keyserver-options = "honor-keyserver-url"; + no-autostart = true; }; + + # Nicely reload system units when changing configs + systemd.user.startServices = "sd-switch"; } diff --git a/home-manager/desktop/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix index bff6738..8145022 100644 --- a/home-manager/desktop/package-configs/firefox.nix +++ b/home-manager/desktop/package-configs/firefox.nix @@ -1,9 +1,12 @@ -{pkgs, ...}: { - stylix.targets.firefox.profileNames = ["lillian"]; +{ + config, + pkgs, + ... +}: { programs.firefox = { enable = true; nativeMessagingHosts = [pkgs.firefoxpwa]; - package = pkgs.floorp; + package = pkgs.firefox; profiles.lillian = { isDefault = true; settings = { @@ -25,70 +28,368 @@ "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.searchEngines" = "DuckDuckGo"; }; - bookmarks = { - force = true; - settings = [ - { - name = "DIY HRT"; - toolbar = false; - bookmarks = [ - { - name = "estrogen production"; - tags = ["chemistry" "oestrogen" "estrogen" "diy"]; - url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide"; - } - { - name = "DIY HRT info"; - tags = ["guides" "wiki" "information" "DIY" "HRT" "estrogen" "testosterone"]; - url = "https://diyhrt.info/"; - } - ]; - } - { - name = "repair resources"; - toolbar = false; - bookmarks = [ - { - name = "manuals library"; - tags = ["repair" "manuals" "documentation"]; - url = "https://manualslib.com/"; - } - ]; - } - { - name = "Nix sites"; - toolbar = false; - bookmarks = [ - { - name = "packages"; - tags = ["packages" "basic" "nix"]; - url = "https://search.nixos.org/"; - } - { - name = "settings"; - tags = ["settings" "services" "packages" "nix"]; - url = "https://mynixos.com"; - } - ]; - } - { - name = "Games"; - toolbar = false; - bookmarks = [ - { - name = "PoE2 build sorceres"; - tags = ["PoE" "PoE2" "path of exile" "path of exile 2" "games" "guides" "build" "sorcerer" "sorceres"]; - url = "https://maxroll.gg/poe2/planner/caeye0hz"; - } - { - name = "PoE2 build ranger"; - tags = ["PoE" "PoE2" "path of exile" "path of exile 2" "games" "guides" "build" "bow" "ranger"]; - url = "https://maxroll.gg/poe2/build-guides/deadeye-gas-arrow-leveling-guide"; - } - ]; - } - ]; - }; + userChrome = '' + /* + Title: Drannex42's FirefoxSidebar / Vertical Tabs + Description: Vertical tab design for Firefox with dynamic indentation:: + Sideberry and TreeStyleTabs (Legacy) themes available! + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: 12022.04.17 + */ + + /* + Preferences / Settings :: + Use this file to set your preferences this will save them in one place for easier future updating + ========================================================================= + */ + + /* + Preferences / Settings + Use this file to set your preferences this will save them in one place for easier future updating + ========================================================================= + */ + + :root { + --sidebar-width: 50px; + --toolbar-height: -12px; + --menubar-height: -42px; + --sidebar-padding: calc(var(--sidebar-width) + 5px); + --toolbar-start-end-padding: 5px !important; + + /* Custom Sidebar/Header Backround :: + This sets the background for the other sidebar options (bookmarks, history, in case it is transparent from a theme that is not set up properly + */ + /* --custom-sidebar-bg: Field; /* Default: Field (Disabled) */ + --custom-sidebar-header-bg: #000; /* Default: Field (Disabled) */ + + /* ====== Extension Settings ====== */ + + /* Window Control / Client Side Display Settings === + If you are putting this on the left or right side uncomment the side + preferences below and comment the other + ========================================================================= + */ + --csd-width: 100px; + --csd-top: 8px; + + /* + CSD - Left Side === + Default: --csd-left: 50px; --csd-margin-left: 92px; + */ + + /* + --csd-left: 50px; + --csd-margin-left: 92px; + */ + + /* + CSD - Right Side === + Defaults: --csd-right: 0px; --csd-margin-right: 95px; + */ + + --csd-right: 36px; + --csd-margin-right: 130px; + + /* === END: Window Control / Client Side Display Settings === */ + + /* === END: Extension Settings === */ + + } + + + /* ========================================================================= */ + + /* Sidebar (Core) :: This file is for the sidebar implementation */ + /* + Extension (Core): Sidebar + Description: This is the core implementation of the sidebar used in drannex42's FirefoxSidebar. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Version: v12022.11.22 (YYYYY.MM.DD) + */ + + #main-window #TabsToolbar { + visibility: collapse; + } + + + + #sidebar-box > #browser, + #webextpanels-window { + background: transparent !important; + + } + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] + #sidebar-header { + /*! display: none; */ + } + + /*Collapse in default state and add transition*/ + #sidebar-box { + /*! overflow: visible !important; */ + border-right: none !important; /* border-right: 1px solid var(--sidebar-border-color) !important; */ + z-index: 2; + border-right: none !important; + width: 100% !important; + background: var(--custom-sidebar-bg, --sidebar-background); + + /* lock sidebar to height by doing the inverse margin of the toolbar element */ + z-index: 1000 !important; + position: relative !important; + margin-top: var(--menubar-height) !important; + border-right: none; + transition: none !important; + + /* lock sidebar to specified width */ + min-width: var(--sidebar-width) !important; + max-width: var(--sidebar-width) !important; + overflow: hidden !important; + transition-property: width; + transition-duration: 0.25s; + transition-delay: 0.25s; + transition-timing-function: ease-in; + } + + #sidebar-box::after { + background: var(--sidebar-border-color) !important; + margin-left: 207px; + z-index: 9999999; + position: absolute; + content: " "; + width: 1px; + height: 100%; + top: 0; + right: 0px; + } + + #sidebar-box:hover:after { + top: 42px; + } + + /*All other sidebar-boxes should be larger on hover*/ + #sidebar-box:hover, #sidebar-box #sidebar:hover { + min-width: 350px !important; + max-width: 350px !important; + z-index: 999; + margin-right: -300px !important; + } + + /*Tree Style Tabs && Sideberry specific sidebar width and size*/ + + #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"]:hover, + #sidebar-box[sidebarcommand="_3c078156-979c-498b-8990-85f7987dd929_-sidebar-action"] #sidebar:hover { + min-width: 260px !important; + max-width: 260px !important; + margin-right: -210px !important; + } + + #sidebar-header { + border: none !important; + border-right: 1px solid var(--sidebar-border-color); + background: var(--custom-sidebar-header-bg, transparent) !important; + } + + #sidebar-close, + #sidebar-title, + #sidebar-switcher-arrow { + display: none; + border: none; + } + + #sidebar-switcher-target { + border: none !important; + margin-left: 4.5px !important; + padding-top: 4px !important; + padding-bottom: 6px !important; + } + + #sidebar-switcher-target:focus-visible:not(:hover, [open]), + #sidebar-close:focus-visible:not(:hover, [open]) { + outline: none !important; + } + + + + .sidebar-splitter { + opacity: 0 !important; + width: 0px !important; + border: none !important; + --avatar-image-url: none !important; + } + + #sidebarMenu-popup .subviewbutton { + min-width: 0px; + padding: 0; + margin: 0 !important; + } + + toolbarseparator { + display: none; + } + + #nav-bar-customization-target { + z-index: 99999; + position: relative; + } + + .browser-toolbar { + padding-left: var(--sidebar-width) !important; + position: relative !important; + } + + #PersonalToolbar { + padding: 2px 5px !important; + padding-top: 0px !important; + margin-top: 0px !important; + padding-left: calc(var(--sidebar-width) + 6px) !important; + } + + + /* + Extensions :: + To enable/disable specific extensions just comment/uncomment the line below. + ========================================================================= + */ + + /* CSD / Window Controls */ + /* + Extension: Window Controls / Client Side Decorations (CSD) + Description: This brings the window controls into the main bar (where the address bar exists). Please see the prefs.css folder for switching the sides from left to right. + Repository URL: https://github.com/drannex42/FirefoxSidebar + Contributors: Mr-nUUb, Xanaxus, Drannex42 + Issue URL: https://github.com/drannex42/FirefoxSidebar/issues/14 + */ + + /* allow the buttons to appear */ + .browser-toolbar { + position: unset !important; + } + + /* reserve space for buttons */ + #nav-bar { + padding-right: var(--csd-margin-right) !important; + margin-left: var(--csd-margin-left) !important; + } + + /* move buttons next to menu button */ + .titlebar-buttonbox-container { + visibility: visible !important; + position: fixed !important; + display: block; + z-index: 999999999; + top: var(--csd-top, inherit); + right: var(--csd-right, inherit); + left: var(--csd-left, inherit); + max-width: var(--csd-width); + } + + /* hide buttons in fullscreen mode (video player and F11) */ + #main-window[inFullscreen="true"] .titlebar-buttonbox-container, + #main-window[inDOMFullscreen="true"] .titlebar-buttonbox-container { + visibility: hidden !important; + } + + /* remove empty space when in fullscreen mode (F11) */ + #main-window[inFullscreen="true"] #nav-bar { + padding-right: 0px !important; + margin-left: 0px !important; + } + /* END Client Side Decorations / Window Controls */ + + + + /* --- Prevent enlargement */ + #urlbar[breakout-extend] { + top: calc( + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + ) !important; + left: 0 !important; + width: 100% !important; + } + + #urlbar[breakout-extend] #urlbar-input-container { + height: var(--urlbar-height) !important; + /* padding: 0px !important; */ + padding-block: 0px !important; + padding-inline: 0px !important; + } + .urlbarView-row { + padding: 0px 2px 0px 2px; + } + /* END Prevent enlargement --- */ + + /*/* --- Reduce row paddings to make them more compact */ + .urlbarView-row { + padding: 2px 0px !important; + line-height: 1.2em !important; + margin: -1px; + margin-bottom: 0px; + } + .urlbarView-row-inner { + padding-bottom: 6px !important; + } + .urlbarView { + margin: 0px !important; + width: 100% !important; + } + /* END Reduce row paddings to make them more compact --- */ + + /* Disable Urlbar Animation */ + #urlbar[breakout][breakout-extend][breakout-extend-animate] + > #urlbar-background { + animation-name: none !important; + animation: none !important; + } + /* END Disable Urlbar Animation */ + + /* --- More compact "Search with Google" rows */ + .urlbarView-row[dynamicType="onboardTabToSearch"] > .urlbarView-row-inner { + min-height: auto !important; + width: auto !important; + } + .urlbarView-row[dynamicType="onboardTabToSearch"] + > .urlbarView-row-inner + > .urlbarView-no-wrap + > .urlbarView-favicon { + margin-bottom: -1px; + } + /* END More compact "Search with Google" rows --- */ + + /* Remove active border on the addressbar when in focus */ + #nav-bar { + --toolbar-field-focus-border-color: #ccc; + } + + /* Remove box shadow on address bar */ + #urlbar-background, + #searchbar { + box-shadow: none !important; + } + ''; + bookmarks = [ + { + name = "estrogen production"; + tags = ["chemistry" "oestrogen" "estrogen" "diy"]; + url = "https://crimethinc.com/2022/12/15/producing-transdermal-estrogen-a-do-it-yourself-guide"; + } + { + name = "Nix sites"; + toolbar = false; + bookmarks = [ + { + name = "packages"; + tags = ["packages" "basic" "nix"]; + url = "https://search.nixos.org/"; + } + { + name = "settings"; + tags = ["settings" "services" "packages" "nix"]; + url = "https://mynixos.com"; + } + ]; + } + ]; }; }; } diff --git a/home-manager/desktop/package-configs/foot/default.nix b/home-manager/desktop/package-configs/foot/default.nix index aada26e..464925f 100644 --- a/home-manager/desktop/package-configs/foot/default.nix +++ b/home-manager/desktop/package-configs/foot/default.nix @@ -1,9 +1,15 @@ -{...}: { +{ + lib, + pkgs, + inputs, + ... +}: { programs.foot = { enable = true; - # catppuccin.enable = true; + catppuccin.enable = true; settings = { main = { + font = "Fira Code:size=11"; }; mouse = { diff --git a/home-manager/desktop/package-configs/freetube/default.nix b/home-manager/desktop/package-configs/freetube/default.nix deleted file mode 100644 index 34a27a0..0000000 --- a/home-manager/desktop/package-configs/freetube/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - home.file."settings.db" = { - source = ./settings.db; - target = ".config/freetube/settings.db"; - force = true; - }; -} diff --git a/home-manager/desktop/package-configs/freetube/settings.db b/home-manager/desktop/package-configs/freetube/settings.db deleted file mode 100644 index e3dcbc4..0000000 --- a/home-manager/desktop/package-configs/freetube/settings.db +++ /dev/null @@ -1,24 +0,0 @@ -{"_id":"allowDashAv1Formats","value":true} -{"_id":"barColor","value":true} -{"_id":"baseTheme","value":"catppuccinMocha"} -{"_id":"bounds","value":{"x":0,"y":66,"width":2560,"height":1374,"maximized":true,"fullScreen":false}} -{"_id":"defaultQuality","value":"1080"} -{"_id":"fetchSubscriptionsAutomatically","value":false} -{"_id":"generalAutoLoadMorePaginatedItemsEnabled","value":true} -{"_id":"hideActiveSubscriptions","value":true} -{"_id":"hidePopularVideos","value":true} -{"_id":"hideRecommendedVideos","value":true} -{"_id":"hideSubscriptionsCommunity","value":true} -{"_id":"hideSubscriptionsLive","value":true} -{"_id":"hideSubscriptionsShorts","value":true} -{"_id":"hideSubscriptionsVideos","value":true} -{"_id":"hideTrendingVideos","value":true} -{"_id":"landingPage","value":"history"} -{"_id":"mainColor","value":"CatppuccinMochaMauve"} -{"_id":"playNextVideo","value":false} -{"_id":"quickBookmarkTargetPlaylistId","value":"favorites"} -{"_id":"secColor","value":"CatppuccinMochaMauve"} -{"_id":"showDistractionFreeTitles","value":true} -{"_id":"useDeArrowThumbnails","value":true} -{"_id":"useDeArrowTitles","value":true} -{"_id":"useSponsorBlock","value":true} diff --git a/home-manager/desktop/package-configs/konsole/default.nix b/home-manager/desktop/package-configs/konsole/default.nix index e8d5f29..a704737 100644 --- a/home-manager/desktop/package-configs/konsole/default.nix +++ b/home-manager/desktop/package-configs/konsole/default.nix @@ -1,4 +1,9 @@ -{...}: { +{ + lib, + pkgs, + inputs, + ... +}: { home.file = { "profile" = { source = ./Catppuccin.profile; diff --git a/home-manager/desktop/package-configs/plasma-desktop.nix b/home-manager/desktop/package-configs/plasma-desktop.nix index 7331c1b..5d68046 100644 --- a/home-manager/desktop/package-configs/plasma-desktop.nix +++ b/home-manager/desktop/package-configs/plasma-desktop.nix @@ -1,145 +1,6 @@ -{osConfig, ...}: { - home.file.".config/kdeconnect/config" = { - text = '' - [General] - keyAlgorithm=EC - name=${osConfig.networking.hostName} - customDevices=10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5 - ''; - target = ".config/kdeconnect/config"; - force = true; - }; - +{ programs.plasma = { enable = true; - desktop.mouseActions.verticalScroll = "switchVirtualDesktop"; - kscreenlocker.appearance.wallpaper = "${osConfig.stylix.image}"; - fonts = { - fixedWidth = { - pointSize = 11; - family = "${osConfig.stylix.fonts.monospace.name}"; - }; - general = { - pointSize = 11; - family = "${osConfig.stylix.fonts.serif.name}"; - }; - menu = { - pointSize = 11; - family = "${osConfig.stylix.fonts.sansSerif.name}"; - }; - small = { - pointSize = 11; - family = "${osConfig.stylix.fonts.sansSerif.name}"; - }; - toolbar = { - pointSize = 11; - family = "${osConfig.stylix.fonts.sansSerif.name}"; - }; - windowTitle = { - pointSize = 11; - family = "${osConfig.stylix.fonts.sansSerif.name}"; - }; - }; - panels = [ - { - alignment = "left"; - floating = true; - height = 38; - location = "top"; - screen = "all"; - widgets = [ - "org.kde.plasma.appmenu" - "org.kde.plasma.panelspacer" - "org.kde.milou" - "org.kde.plasma.panelspacer" - "org.kde.plasma.colorpicker" - { - systemTray.items = { - # We explicitly show bluetooth and battery - shown = [ - "org.kde.plasma.volume" - "org.kde.plasma.bluetooth" - "org.kde.plasma.brightness" - "org.kde.plasma.devicenotifier" - "org.kde.kscreen" - "org.kde.kdeconnect" - "org.kde.plasma.networkmanagement" - "org.kde.plasma.battery" - "org.kde.plasma.clipboard" - "org.kde.plasma.mediacontroller" - "org.kde.plasma.notifications" - "org.kde.plasma.weather" - ]; - # And explicitly hide networkmanagement and volume - hidden = [ - "Xwayland Video Bridge_pipewireToXProxy" - "org.kde.plasma.devicenotifier" - "org.kde.kscreen" - "org.kde.plasma.printmanager" - "chrome_status_icon_1" - "proton-vpn-app" - "Nitrokey App" - "qBittorrent" - "vlc" - "steam" - ]; - }; - } - { - digitalClock = { - calendar.firstDayOfWeek = "monday"; - time.format = "24h"; - date = { - enable = true; - format = "isoDate"; - position = "belowTime"; - }; - timeZone.selected = ["Europe/Amsterdam"]; - }; - } - "org.kde.plasma.lock_logout" - ]; - } - { - alignment = "center"; - floating = true; - height = 44; - hiding = "autohide"; - maxLength = 1920; - minLength = 1200; - location = "bottom"; - screen = "all"; - widgets = [ - "org.kde.plasma.kickoff" - "org.kde.plasma.panelspacer" - { - name = "org.kde.plasma.icontasks"; - config = { - General = { - launchers = [ - "applications:floorp.desktop" - "applications:systemsettings.desktop" - "applications:org.kde.dolphin.desktop" - "applications:signal.desktop" - "applications:vesktop.desktop" - "applications:thunderbird.desktop" - "applications:cinny.desktop" - "applications:steam.desktop" - "applications:noisetorch.desktop" - "applications:org.kde.plasma-systemmonitor.desktop" - "applications:foot.desktop" - "applications:nitrokey-app.desktop" - "applications:freetube.desktop" - ]; - }; - }; - } - "org.kde.plasma.panelspacer" - "org.kde.plasma.minimizeall" - ]; - } - ]; - shortcuts = { "ActivityManager"."switch-to-activity-a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = []; "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L"; @@ -147,7 +8,7 @@ "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; + "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"]; "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = []; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; @@ -155,29 +16,40 @@ "kmix"."increase_microphone_volume" = "Microphone Volume Up"; "kmix"."increase_volume" = "Volume Up"; "kmix"."increase_volume_small" = "Shift+Volume Up"; - "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"]; + "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute"]; "kmix"."mute" = "Volume Mute"; - "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation"; - "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"]; + "ksmserver"."Halt Without Confirmation" = []; + "ksmserver"."Lock Session" = ["Meta+L" "Screensaver"]; "ksmserver"."Log Out" = "Ctrl+Alt+Del"; - "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation"; - "ksmserver"."LogOut" = "none,,Log Out"; - "ksmserver"."Reboot" = "none,,Reboot"; - "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation"; - "ksmserver"."Shut Down" = "none,,Shut Down"; + "ksmserver"."Log Out Without Confirmation" = []; + "ksmserver"."Reboot" = []; + "ksmserver"."Reboot Without Confirmation" = []; + "ksmserver"."Shut Down" = []; "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; + "kwin"."Cube" = "Meta+C"; + "kwin"."Cycle Overview" = []; + "kwin"."Cycle Overview Opposite" = []; + "kwin"."Decrease Opacity" = []; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; - "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; + "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C)"]; "kwin"."ExposeClass" = "Ctrl+F7"; + "kwin"."ExposeClassCurrentDesktop" = []; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Increase Opacity" = []; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; + "kwin"."Move Tablet to Next Output" = []; "kwin"."MoveMouseToCenter" = "Meta+F6"; "kwin"."MoveMouseToFocus" = "Meta+F5"; + "kwin"."MoveZoomDown" = []; + "kwin"."MoveZoomLeft" = []; + "kwin"."MoveZoomRight" = []; + "kwin"."MoveZoomUp" = []; "kwin"."Overview" = "Meta+W"; - "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut"; + "kwin"."Setup Window Shortcut" = []; "kwin"."Show Desktop" = "Meta+D"; + "kwin"."ShowDesktopGrid" = "Meta+F8"; + "kwin"."Suspend Compositing" = "Alt+Shift+F12"; "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down"; "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up"; "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left"; @@ -187,51 +59,154 @@ "kwin"."Switch Window Right" = "Meta+Alt+Right"; "kwin"."Switch Window Up" = "Meta+Alt+Up"; "kwin"."Switch to Desktop 1" = "Ctrl+F1"; + "kwin"."Switch to Desktop 10" = []; + "kwin"."Switch to Desktop 11" = []; + "kwin"."Switch to Desktop 12" = []; + "kwin"."Switch to Desktop 13" = []; + "kwin"."Switch to Desktop 14" = []; + "kwin"."Switch to Desktop 15" = []; + "kwin"."Switch to Desktop 16" = []; + "kwin"."Switch to Desktop 17" = []; + "kwin"."Switch to Desktop 18" = []; + "kwin"."Switch to Desktop 19" = []; "kwin"."Switch to Desktop 2" = "Ctrl+F2"; + "kwin"."Switch to Desktop 20" = []; "kwin"."Switch to Desktop 3" = "Ctrl+F3"; "kwin"."Switch to Desktop 4" = "Ctrl+F4"; + "kwin"."Switch to Desktop 5" = []; + "kwin"."Switch to Desktop 6" = []; + "kwin"."Switch to Desktop 7" = []; + "kwin"."Switch to Desktop 8" = []; + "kwin"."Switch to Desktop 9" = []; + "kwin"."Switch to Next Desktop" = []; + "kwin"."Switch to Next Screen" = []; + "kwin"."Switch to Previous Desktop" = []; + "kwin"."Switch to Previous Screen" = []; + "kwin"."Switch to Screen 0" = []; + "kwin"."Switch to Screen 1" = []; + "kwin"."Switch to Screen 2" = []; + "kwin"."Switch to Screen 3" = []; + "kwin"."Switch to Screen 4" = []; + "kwin"."Switch to Screen 5" = []; + "kwin"."Switch to Screen 6" = []; + "kwin"."Switch to Screen 7" = []; + "kwin"."Switch to Screen Above" = []; + "kwin"."Switch to Screen Below" = []; + "kwin"."Switch to Screen to the Left" = []; + "kwin"."Switch to Screen to the Right" = []; + "kwin"."Toggle Night Color" = []; + "kwin"."Toggle Window Raise/Lower" = []; + "kwin"."Walk Through Desktop List" = []; + "kwin"."Walk Through Desktop List (Reverse)" = []; + "kwin"."Walk Through Desktops" = []; + "kwin"."Walk Through Desktops (Reverse)" = []; "kwin"."Walk Through Windows" = "Alt+Tab"; - "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab"; - "kwin"."Walk Through Windows of Current Application" = "Alt+`"; + "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Backtab"; + "kwin"."Walk Through Windows Alternative" = []; + "kwin"."Walk Through Windows Alternative (Reverse)" = []; + "kwin"."Walk Through Windows of Current Application" = []; "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~"; + "kwin"."Walk Through Windows of Current Application Alternative" = []; + "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = []; + "kwin"."Window Above Other Windows" = []; + "kwin"."Window Below Other Windows" = []; "kwin"."Window Close" = "Alt+F4"; + "kwin"."Window Fullscreen" = []; + "kwin"."Window Grow Horizontal" = []; + "kwin"."Window Grow Vertical" = []; + "kwin"."Window Lower" = []; "kwin"."Window Maximize" = "Meta+PgUp"; + "kwin"."Window Maximize Horizontal" = []; + "kwin"."Window Maximize Vertical" = []; "kwin"."Window Minimize" = "Meta+PgDown"; + "kwin"."Window Move" = []; + "kwin"."Window Move Center" = []; + "kwin"."Window No Border" = []; + "kwin"."Window On All Desktops" = []; "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down"; "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up"; "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left"; "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right"; + "kwin"."Window One Screen Down" = []; + "kwin"."Window One Screen Up" = []; + "kwin"."Window One Screen to the Left" = []; + "kwin"."Window One Screen to the Right" = []; "kwin"."Window Operations Menu" = "Alt+F3"; + "kwin"."Window Pack Down" = []; + "kwin"."Window Pack Left" = []; + "kwin"."Window Pack Right" = []; + "kwin"."Window Pack Up" = []; "kwin"."Window Quick Tile Bottom" = "Meta+Down"; + "kwin"."Window Quick Tile Bottom Left" = []; + "kwin"."Window Quick Tile Bottom Right" = []; "kwin"."Window Quick Tile Left" = "Meta+Left"; "kwin"."Window Quick Tile Right" = "Meta+Right"; "kwin"."Window Quick Tile Top" = "Meta+Up"; - "kwin"."Window to Next Screen" = "Meta+Shift+Right"; - "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop"; - "kwin"."Window to Previous Screen" = "Meta+Shift+Left"; - "kwin"."view_actual_size" = "\\, Meta+0\\, ,Meta+0,Zoom to Actual Size"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; + "kwin"."Window Quick Tile Top Left" = []; + "kwin"."Window Quick Tile Top Right" = []; + "kwin"."Window Raise" = []; + "kwin"."Window Resize" = []; + "kwin"."Window Shade" = []; + "kwin"."Window Shrink Horizontal" = []; + "kwin"."Window Shrink Vertical" = []; + "kwin"."Window to Desktop 1" = []; + "kwin"."Window to Desktop 10" = []; + "kwin"."Window to Desktop 11" = []; + "kwin"."Window to Desktop 12" = []; + "kwin"."Window to Desktop 13" = []; + "kwin"."Window to Desktop 14" = []; + "kwin"."Window to Desktop 15" = []; + "kwin"."Window to Desktop 16" = []; + "kwin"."Window to Desktop 17" = []; + "kwin"."Window to Desktop 18" = []; + "kwin"."Window to Desktop 19" = []; + "kwin"."Window to Desktop 2" = []; + "kwin"."Window to Desktop 20" = []; + "kwin"."Window to Desktop 3" = []; + "kwin"."Window to Desktop 4" = []; + "kwin"."Window to Desktop 5" = []; + "kwin"."Window to Desktop 6" = []; + "kwin"."Window to Desktop 7" = []; + "kwin"."Window to Desktop 8" = []; + "kwin"."Window to Desktop 9" = []; + "kwin"."Window to Next Desktop" = []; + "kwin"."Window to Next Screen" = []; + "kwin"."Window to Previous Desktop" = []; + "kwin"."Window to Previous Screen" = []; + "kwin"."Window to Screen 0" = []; + "kwin"."Window to Screen 1" = []; + "kwin"."Window to Screen 2" = []; + "kwin"."Window to Screen 3" = []; + "kwin"."Window to Screen 4" = []; + "kwin"."Window to Screen 5" = []; + "kwin"."Window to Screen 6" = []; + "kwin"."Window to Screen 7" = []; + "kwin"."view_actual_size" = "Meta+0"; + "kwin"."view_zoom_in" = "Meta++"; "kwin"."view_zoom_out" = "Meta+-"; + "mediacontrol"."mediavolumedown" = []; + "mediacontrol"."mediavolumeup" = []; "mediacontrol"."nextmedia" = "Media Next"; "mediacontrol"."pausemedia" = "Media Pause"; + "mediacontrol"."playmedia" = []; "mediacontrol"."playpausemedia" = "Media Play"; "mediacontrol"."previousmedia" = "Media Previous"; "mediacontrol"."stopmedia" = "Media Stop"; "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down"; - "org_kde_powerdevil"."Decrease Screen Brightness" = ["Monitor Brightness Down" "Ctrl+Volume Down"]; - "org_kde_powerdevil"."Decrease Screen Brightness Small" = ["Monitor Brightness Down" "Ctrl+Shift+Volume Down"]; + "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down"; + "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down"; "org_kde_powerdevil"."Hibernate" = "Hibernate"; "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up"; - "org_kde_powerdevil"."Increase Screen Brightness" = ["Monitor Brightness Up" "Ctrl+Volume Up"]; - "org_kde_powerdevil"."Increase Screen Brightness Small" = ["Shift+Monitor Brightness Up" "Ctrl+Shift+Volume Up"]; + "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up"; + "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up"; "org_kde_powerdevil"."PowerDown" = "Power Down"; "org_kde_powerdevil"."PowerOff" = "Power Off"; "org_kde_powerdevil"."Sleep" = "Sleep"; "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off"; - "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"]; - "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"]; + "org_kde_powerdevil"."Turn Off Screen" = []; + "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B"]; "plasmashell"."activate task manager entry 1" = "Meta+1"; - "plasmashell"."activate task manager entry 10" = ",Meta+0,Activate Task Manager Entry 10"; + "plasmashell"."activate task manager entry 10" = []; "plasmashell"."activate task manager entry 2" = "Meta+2"; "plasmashell"."activate task manager entry 3" = "Meta+3"; "plasmashell"."activate task manager entry 4" = "Meta+4"; @@ -240,41 +215,51 @@ "plasmashell"."activate task manager entry 7" = "Meta+7"; "plasmashell"."activate task manager entry 8" = "Meta+8"; "plasmashell"."activate task manager entry 9" = "Meta+9"; - "plasmashell"."clear-history" = "none,,Clear Clipboard History"; + "plasmashell"."clear-history" = []; "plasmashell"."clipboard_action" = "Meta+Ctrl+X"; "plasmashell"."cycle-panels" = "Meta+Alt+P"; + "plasmashell"."cycleNextAction" = []; + "plasmashell"."cyclePrevAction" = []; "plasmashell"."edit_clipboard" = []; "plasmashell"."manage activities" = "Meta+Q"; + "plasmashell"."next activity" = "Meta+Tab"; + "plasmashell"."previous activity" = "Meta+Shift+Tab"; "plasmashell"."repeat_action" = "Meta+Ctrl+R"; "plasmashell"."show dashboard" = "Ctrl+F12"; + "plasmashell"."show-barcode" = []; "plasmashell"."show-on-mouse-pos" = "Meta+V"; "plasmashell"."stop current activity" = "Meta+S"; - "services/org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Ctrl+Shift+Space" "Search"]; + "plasmashell"."switch to next activity" = []; + "plasmashell"."switch to previous activity" = []; + "plasmashell"."toggle do not disturb" = []; "services/org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["Meta+Print" "Ctrl+!"]; "services/org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = ["Ctrl+$" "Shift+Print"]; "services/org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; + "services/org.kde.spectacle.desktop"."RecordRegion" = []; + "services/org.kde.spectacle.desktop"."RecordScreen" = []; + "services/org.kde.spectacle.desktop"."RecordWindow" = []; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["Ctrl+@" "Meta+Shift+Print"]; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["Meta+Ctrl+Print" "Ctrl+%"]; "services/org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.org.kde.spectacle.desktop"."_launch" = "Print"; "services/services.services.org.kde.plasma-systemmonitor.desktop"."_launch" = "Ctrl+Esc"; - "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "" "" "Meta+Print" "Ctrl+!"]; + "services/services.services.org.kde.spectacle.desktop"."ActiveWindowScreenShot" = ["" "" "" "" "" "Meta+Print" "Ctrl+!"]; "services/services.services.org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = "Ctrl+#"; - "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "" "" "Ctrl+$" "Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."FullScreenScreenShot" = ["" "" "" "" "" "Ctrl+$" "Shift+Print"]; "services/services.services.org.kde.spectacle.desktop"."OpenWithoutScreenshot" = "Ctrl+^"; "services/services.services.org.kde.spectacle.desktop"."RecordWindow" = []; - "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; - "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; + "services/services.services.org.kde.spectacle.desktop"."RectangularRegionScreenShot" = ["" "" "" "" "" "Ctrl+@" "Meta+Shift+Print"]; + "services/services.services.org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = ["" "" "" "" "" "Meta+Ctrl+Print" "Ctrl+%"]; "services/services.services.org.kde.spectacle.desktop"."_launch" = "Print"; }; configFile = { @@ -283,11 +268,8 @@ "baloofilerc"."General"."exclude filters version" = 8; "dolphinrc"."ExtractDialog"."1536x864 screen: Height" = 560; "dolphinrc"."ExtractDialog"."1536x864 screen: Width" = 1024; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Height" = 540; - "dolphinrc"."ExtractDialog"."1920x1080 screen: Width" = 1260; - "dolphinrc"."ExtractDialog"."DirHistoryx5b$ex5d" = "/home/"; + "dolphinrc"."ExtractDialog"."DirHistory[$e]" = "/home/"; "dolphinrc"."General"."RememberOpenedTabs" = false; - "dolphinrc"."General"."ViewPropsTimestamp" = "2024,8,28,22,44,37.273"; "dolphinrc"."IconsMode"."PreviewSize" = 80; "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false; "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22; @@ -296,128 +278,6 @@ "dolphinrc"."Search"."Location" = "Everywhere"; "kactivitymanagerdrc"."activities"."a2cd7f51-1f1f-47a8-9544-a4c401f57a12" = "Default"; "kactivitymanagerdrc"."main"."currentActivity" = "a2cd7f51-1f1f-47a8-9544-a4c401f57a12"; - "katerc"."General"."Days Meta Infos" = 30; - "katerc"."General"."Save Meta Infos" = true; - "katerc"."General"."Show Full Path in Title" = false; - "katerc"."General"."Show Menu Bar" = true; - "katerc"."General"."Show Status Bar" = true; - "katerc"."General"."Show Tab Bar" = true; - "katerc"."General"."Show Url Nav Bar" = true; - "katerc"."KTextEditor Document"."Allow End of Line Detection" = true; - "katerc"."KTextEditor Document"."Auto Detect Indent" = true; - "katerc"."KTextEditor Document"."Auto Reload If State Is In Version Control" = true; - "katerc"."KTextEditor Document"."Auto Save" = false; - "katerc"."KTextEditor Document"."Auto Save Interval" = 0; - "katerc"."KTextEditor Document"."Auto Save On Focus Out" = false; - "katerc"."KTextEditor Document"."BOM" = false; - "katerc"."KTextEditor Document"."Backup Local" = false; - "katerc"."KTextEditor Document"."Backup Prefix" = ""; - "katerc"."KTextEditor Document"."Backup Remote" = false; - "katerc"."KTextEditor Document"."Backup Suffix" = "~"; - "katerc"."KTextEditor Document"."Camel Cursor" = true; - "katerc"."KTextEditor Document"."Encoding" = "UTF-8"; - "katerc"."KTextEditor Document"."End of Line" = 0; - "katerc"."KTextEditor Document"."Indent On Backspace" = true; - "katerc"."KTextEditor Document"."Indent On Tab" = true; - "katerc"."KTextEditor Document"."Indent On Text Paste" = false; - "katerc"."KTextEditor Document"."Indentation Mode" = "normal"; - "katerc"."KTextEditor Document"."Indentation Width" = 4; - "katerc"."KTextEditor Document"."Keep Extra Spaces" = false; - "katerc"."KTextEditor Document"."Line Length Limit" = 10000; - "katerc"."KTextEditor Document"."Newline at End of File" = true; - "katerc"."KTextEditor Document"."On-The-Fly Spellcheck" = false; - "katerc"."KTextEditor Document"."Overwrite Mode" = false; - "katerc"."KTextEditor Document"."PageUp/PageDown Moves Cursor" = false; - "katerc"."KTextEditor Document"."Remove Spaces" = 1; - "katerc"."KTextEditor Document"."ReplaceTabsDyn" = true; - "katerc"."KTextEditor Document"."Show Spaces" = 0; - "katerc"."KTextEditor Document"."Show Tabs" = true; - "katerc"."KTextEditor Document"."Smart Home" = true; - "katerc"."KTextEditor Document"."Swap Directory" = ""; - "katerc"."KTextEditor Document"."Swap File Mode" = 1; - "katerc"."KTextEditor Document"."Swap Sync Interval" = 15; - "katerc"."KTextEditor Document"."Tab Handling" = 2; - "katerc"."KTextEditor Document"."Tab Width" = 4; - "katerc"."KTextEditor Document"."Trailing Marker Size" = 1; - "katerc"."KTextEditor Document"."Word Wrap" = false; - "katerc"."KTextEditor Document"."Word Wrap Column" = 80; - "katerc"."KTextEditor Editor"."Encoding Prober Type" = 1; - "katerc"."KTextEditor Editor"."Fallback Encoding" = "ISO 8859-15"; - "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false; - "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true; - "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Macchiato"; - "katerc"."KTextEditor Renderer"."Font" = "Hack,10,-1,7,50,0,0,0,0,0"; - "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1; - "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false; - "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false; - "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false; - "katerc"."KTextEditor View"."Allow Mark Menu" = true; - "katerc"."KTextEditor View"."Auto Brackets" = true; - "katerc"."KTextEditor View"."Auto Center Lines" = 0; - "katerc"."KTextEditor View"."Auto Completion" = true; - "katerc"."KTextEditor View"."Auto Completion Preselect First Entry" = true; - "katerc"."KTextEditor View"."Backspace Remove Composed Characters" = false; - "katerc"."KTextEditor View"."Bookmark Menu Sorting" = 0; - "katerc"."KTextEditor View"."Bracket Match Preview" = false; - "katerc"."KTextEditor View"."Chars To Enclose Selection" = "<>(){}x5bx5d'\""; - "katerc"."KTextEditor View"."Default Mark Type" = 1; - "katerc"."KTextEditor View"."Dynamic Word Wrap" = true; - "katerc"."KTextEditor View"."Dynamic Word Wrap Align Indent" = 80; - "katerc"."KTextEditor View"."Dynamic Word Wrap At Static Marker" = false; - "katerc"."KTextEditor View"."Dynamic Word Wrap Indicators" = 1; - "katerc"."KTextEditor View"."Dynamic Wrap not at word boundaries" = false; - "katerc"."KTextEditor View"."Enable Tab completion" = false; - "katerc"."KTextEditor View"."Fold First Line" = false; - "katerc"."KTextEditor View"."Folding Bar" = true; - "katerc"."KTextEditor View"."Folding Preview" = true; - "katerc"."KTextEditor View"."Icon Bar" = false; - "katerc"."KTextEditor View"."Input Mode" = 0; - "katerc"."KTextEditor View"."Keyword Completion" = true; - "katerc"."KTextEditor View"."Line Modification" = true; - "katerc"."KTextEditor View"."Line Numbers" = true; - "katerc"."KTextEditor View"."Max Clipboard History Entries" = 20; - "katerc"."KTextEditor View"."Maximum Search History Size" = 100; - "katerc"."KTextEditor View"."Mouse Paste At Cursor Position" = false; - "katerc"."KTextEditor View"."Multiple Cursor Modifier" = 134217728; - "katerc"."KTextEditor View"."Persistent Selection" = false; - "katerc"."KTextEditor View"."Scroll Bar Marks" = false; - "katerc"."KTextEditor View"."Scroll Bar Mini Map All" = true; - "katerc"."KTextEditor View"."Scroll Bar Mini Map Width" = 60; - "katerc"."KTextEditor View"."Scroll Bar MiniMap" = true; - "katerc"."KTextEditor View"."Scroll Bar Preview" = true; - "katerc"."KTextEditor View"."Scroll Past End" = false; - "katerc"."KTextEditor View"."Search/Replace Flags" = 140; - "katerc"."KTextEditor View"."Shoe Line Ending Type in Statusbar" = false; - "katerc"."KTextEditor View"."Show Documentation With Completion" = true; - "katerc"."KTextEditor View"."Show File Encoding" = true; - "katerc"."KTextEditor View"."Show Focus Frame Around Editor" = true; - "katerc"."KTextEditor View"."Show Folding Icons On Hover Only" = true; - "katerc"."KTextEditor View"."Show Line Count" = false; - "katerc"."KTextEditor View"."Show Scrollbars" = 0; - "katerc"."KTextEditor View"."Show Statusbar Dictionary" = true; - "katerc"."KTextEditor View"."Show Statusbar Highlighting Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Input Mode" = true; - "katerc"."KTextEditor View"."Show Statusbar Line Column" = true; - "katerc"."KTextEditor View"."Show Statusbar Tab Settings" = true; - "katerc"."KTextEditor View"."Show Word Count" = false; - "katerc"."KTextEditor View"."Smart Copy Cut" = true; - "katerc"."KTextEditor View"."Statusbar Line Column Compact Mode" = true; - "katerc"."KTextEditor View"."Text Drag And Drop" = true; - "katerc"."KTextEditor View"."User Sets Of Chars To Enclose Selection" = ""; - "katerc"."KTextEditor View"."Vi Input Mode Steal Keys" = false; - "katerc"."KTextEditor View"."Vi Relative Line Numbers" = false; - "katerc"."KTextEditor View"."Word Completion" = true; - "katerc"."KTextEditor View"."Word Completion Minimal Word Length" = 3; - "katerc"."KTextEditor View"."Word Completion Remove Tail" = true; - "katerc"."KTextEditor::Search"."Search History" = "uuid"; - "katerc"."filetree"."editShade" = "93,62,114"; - "katerc"."filetree"."listMode" = false; - "katerc"."filetree"."shadingEnabled" = true; - "katerc"."filetree"."showCloseButton" = false; - "katerc"."filetree"."showFullPathOnRoots" = false; - "katerc"."filetree"."showToolbar" = true; - "katerc"."filetree"."sortRole" = 0; - "katerc"."filetree"."viewShade" = "101,69,143"; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."MiddleButtonEmulation" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."NaturalScroll" = true; "kcminputrc"."Libinput.1739.30383.CUST0001:00 06CB:76AF Touchpad"."TapToClick" = true; @@ -429,16 +289,10 @@ "kded5rc"."Module-browserintegrationreminder"."autoload" = false; "kded5rc"."Module-device_automounter"."autoload" = false; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 1; - "kdeglobals"."DirSelect Dialog"."DirSelectDialog Size" = "960,540"; "kdeglobals"."General"."AccentColor" = "184,117,220"; "kdeglobals"."General"."AllowKDEAppsToRememberWindowPositions" = true; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "184,117,220"; - "kdeglobals"."General"."TerminalApplication" = "foot"; - "kdeglobals"."General"."TerminalService" = "org.codeberg.dnkl.foot.desktop"; - "kdeglobals"."General"."XftAntialias" = true; - "kdeglobals"."General"."XftHintStyle" = "hintslight"; - "kdeglobals"."General"."XftSubPixel" = "rgb"; "kdeglobals"."KDE"."AnimationDurationFactor" = 0.7071067811865475; "kdeglobals"."KDE"."ShowDeleteCommand" = false; "kdeglobals"."KDE"."SingleClick" = false; @@ -468,6 +322,17 @@ "kdeglobals"."WM"."inactiveBackground" = "42,46,50"; "kdeglobals"."WM"."inactiveBlend" = "161,169,177"; "kdeglobals"."WM"."inactiveForeground" = "161,169,177"; + "kglobalshortcutsrc"."ActivityManager"."_k_friendly_name" = "Activity Manager"; + "kglobalshortcutsrc"."KDE Keyboard Layout Switcher"."_k_friendly_name" = "Keyboard Layout Switcher"; + "kglobalshortcutsrc"."kaccess"."_k_friendly_name" = "Accessibility"; + "kglobalshortcutsrc"."kcm_touchpad"."_k_friendly_name" = "Touchpad"; + "kglobalshortcutsrc"."khotkeys"."_k_friendly_name" = "Custom Shortcuts Service"; + "kglobalshortcutsrc"."kmix"."_k_friendly_name" = "Audio Volume"; + "kglobalshortcutsrc"."ksmserver"."_k_friendly_name" = "Session Management"; + "kglobalshortcutsrc"."kwin"."_k_friendly_name" = "KWin"; + "kglobalshortcutsrc"."mediacontrol"."_k_friendly_name" = "Media Controller"; + "kglobalshortcutsrc"."org_kde_powerdevil"."_k_friendly_name" = "KDE Power Management System"; + "kglobalshortcutsrc"."plasmashell"."_k_friendly_name" = "plasmashell"; "khotkeysrc"."Data"."DataCount" = 3; "khotkeysrc"."Data_1"."Comment" = "KMenuEdit Global Shortcuts"; "khotkeysrc"."Data_1"."DataCount" = 1; @@ -1011,7 +876,6 @@ "kservicemenurc"."Show"."setAsWallpaper" = true; "kservicemenurc"."Show"."slideshowfileitemaction" = true; "kservicemenurc"."Show"."tagsfileitemaction" = true; - "ksmserverrc"."General"."loginMode" = "restoreSavedSession"; "kwalletrc"."Wallet"."First Use" = false; "kwinrc"."Desktops"."Id_1" = "d1e5e218-1fd9-4946-aa47-dab2f5aac755"; "kwinrc"."Desktops"."Id_2" = "389927fc-9c76-4f84-ae0d-011cf76868e6"; @@ -1025,7 +889,7 @@ "kwinrc"."NightColor"."LatitudeFixed" = 52.31865273558926; "kwinrc"."NightColor"."LongitudeFixed" = 5.44; "kwinrc"."NightColor"."Mode" = "Location"; - "kwinrc"."NightColor"."NightTemperature" = 2000; + "kwinrc"."NightColor"."NightTemperature" = 1400; "kwinrc"."Plugins"."diminactiveEnabled" = true; "kwinrc"."Plugins"."dimscreenEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true; @@ -1033,11 +897,9 @@ "kwinrc"."Tiling.5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling.5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"layoutDirection\":\"vertical\",\"tiles\":x5b{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d},{\"height\":0.5,\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.5},{\"width\":0.5}x5d}x5d,\"width\":1}x5d}"; - "kwinrc"."Tiling/250b82cb-c8d2-50e6-91f9-1fb3d4d4d06b"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.4989583333333353},{\"width\":0.5010416666666646}]}"; "kwinrc"."Tiling/5242ae1a-0a81-5d7b-ba61-2512b597a159"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; - "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/57cc57cb-6089-56ec-afba-00ccd06d5508"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":x5b{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}x5d}"; "kwinrc"."Tiling/5c337d24-acf0-5ac2-9082-ce9cb012bc2c"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5046875000000002},{\"width\":0.4953124999999998}]}"; - "kwinrc"."Tiling/98e47fc8-bbb3-5a3a-b6a8-d051b513a983"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.5005208333333331},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.4994791666666665}]}"; "kwinrc"."Xwayland"."Scale" = 1; "kxkbrc"."Layout"."Options" = "compose:caps"; "kxkbrc"."Layout"."ResetOldOptions" = true; @@ -1050,135 +912,8 @@ "plasma-localerc"."Formats"."LC_PAPER" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TELEPHONE" = "nl_NL.UTF-8"; "plasma-localerc"."Formats"."LC_TIME" = "en_DK.UTF-8"; - "plasmanotifyrc"."Applications/firefox"."Seen" = true; - "plasmanotifyrc"."Applications/floorp"."Seen" = true; - "plasmanotifyrc"."Applications/org.qbittorrent.qBittorrent"."Seen" = true; - "plasmanotifyrc"."Applications/vesktop"."Seen" = true; - "plasmanotifyrc"."Applications/webcord"."Seen" = true; "plasmarc"."Wallpapers"."usersWallpapers" = ""; - "spectaclerc"."Annotations"."annotationToolType" = 9; - "spectaclerc"."ImageSave"."lastImageSaveLocation" = "file:///home/lillian/Pictures/Screenshots/Screenshot_20241017_154815.png"; - "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots"; - "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts"; "systemsettingsrc"."KFileDialog Settings"."detailViewIconSize" = 16; }; - dataFile = { - "dolphin/view_properties/global/.directory"."Settings"."HiddenFilesShown" = true; - "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false; - "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesqlplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false; - "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false; - "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true; - "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true; - "kate/anonymous.katesession"."MainWindow0"."2 screens: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,2514,0"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 1287; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 1287; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = ""; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 2514; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin"; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 2560; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false; - "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,1285,0"; - "kate/anonymous.katesession"."MainWindow0"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."2 screens: Window-Maximized" = true; - "kate/anonymous.katesession"."MainWindow0 Settings"."MenuBar" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled"; - "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 10; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0"; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1; - "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 2514; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Count" = 0; - "kate/anonymous.katesession"."MainWindow0-ViewSpace 0"."Documents" = ""; - "kate/anonymous.katesession"."Open Documents"."Count" = 0; - "kate/anonymous.katesession"."Open MainWindows"."Count" = 1; - "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1"; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = ""; - "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false; - }; }; } diff --git a/home-manager/desktop/package-configs/vesktop/default.nix b/home-manager/desktop/package-configs/vesktop/default.nix deleted file mode 100644 index b02afec..0000000 --- a/home-manager/desktop/package-configs/vesktop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - home.file."settings.json" = { - source = ./settings.json; - target = ".config/vesktop/settings/settings.json"; - force = true; - }; -} diff --git a/home-manager/desktop/package-configs/vesktop/settings.json b/home-manager/desktop/package-configs/vesktop/settings.json deleted file mode 100644 index 5531e9b..0000000 --- a/home-manager/desktop/package-configs/vesktop/settings.json +++ /dev/null @@ -1,602 +0,0 @@ -{ - "autoUpdate": true, - "autoUpdateNotification": false, - "useQuickCss": true, - "themeLinks": [], - "enabledThemes": [ - "stylix.theme.css" - ], - "enableReactDevtools": false, - "frameless": false, - "transparent": false, - "winCtrlQ": false, - "disableMinSize": false, - "winNativeTitleBar": false, - "plugins": { - "ChatInputButtonAPI": { - "enabled": true - }, - "CommandsAPI": { - "enabled": true - }, - "MemberListDecoratorsAPI": { - "enabled": false - }, - "MessageAccessoriesAPI": { - "enabled": true - }, - "MessageDecorationsAPI": { - "enabled": false - }, - "MessageEventsAPI": { - "enabled": true - }, - "MessagePopoverAPI": { - "enabled": false - }, - "MessageUpdaterAPI": { - "enabled": false - }, - "ServerListAPI": { - "enabled": false - }, - "UserSettingsAPI": { - "enabled": true - }, - "AccountPanelServerProfile": { - "enabled": false - }, - "AlwaysAnimate": { - "enabled": false - }, - "AlwaysExpandRoles": { - "enabled": false - }, - "AlwaysTrust": { - "enabled": true, - "domain": true, - "file": true - }, - "AnonymiseFileNames": { - "enabled": true, - "anonymiseByDefault": true, - "method": 0, - "randomisedLength": 7 - }, - "AppleMusicRichPresence": { - "enabled": false - }, - "WebRichPresence (arRPC)": { - "enabled": false - }, - "BANger": { - "enabled": false - }, - "BetterFolders": { - "enabled": false - }, - "BetterGifAltText": { - "enabled": false - }, - "BetterGifPicker": { - "enabled": false - }, - "BetterNotesBox": { - "enabled": false - }, - "BetterRoleContext": { - "enabled": false - }, - "BetterRoleDot": { - "enabled": false - }, - "BetterSessions": { - "enabled": false - }, - "BetterSettings": { - "enabled": false - }, - "BetterUploadButton": { - "enabled": false - }, - "BiggerStreamPreview": { - "enabled": false - }, - "BlurNSFW": { - "enabled": false - }, - "CallTimer": { - "enabled": false - }, - "ClearURLs": { - "enabled": false - }, - "ClientTheme": { - "enabled": false - }, - "ColorSighted": { - "enabled": false - }, - "ConsoleJanitor": { - "enabled": false - }, - "ConsoleShortcuts": { - "enabled": false - }, - "CopyEmojiMarkdown": { - "enabled": false - }, - "CopyFileContents": { - "enabled": false - }, - "CopyUserURLs": { - "enabled": false - }, - "CrashHandler": { - "enabled": true - }, - "CtrlEnterSend": { - "enabled": false - }, - "CustomRPC": { - "enabled": false - }, - "CustomIdle": { - "enabled": false - }, - "Dearrow": { - "enabled": false - }, - "Decor": { - "enabled": false - }, - "DisableCallIdle": { - "enabled": false - }, - "DontRoundMyTimestamps": { - "enabled": false - }, - "EmoteCloner": { - "enabled": false - }, - "Experiments": { - "enabled": false - }, - "F8Break": { - "enabled": false - }, - "FakeNitro": { - "enabled": true, - "enableEmojiBypass": true, - "emojiSize": 48, - "transformEmojis": true, - "enableStickerBypass": true, - "stickerSize": 160, - "transformStickers": true, - "transformCompoundSentence": false, - "enableStreamQualityBypass": true, - "useHyperLinks": true, - "hyperLinkText": "{{NAME}}", - "disableEmbedPermissionCheck": false - }, - "FakeProfileThemes": { - "enabled": false - }, - "FavoriteEmojiFirst": { - "enabled": false - }, - "FavoriteGifSearch": { - "enabled": false - }, - "FixCodeblockGap": { - "enabled": false - }, - "FixSpotifyEmbeds": { - "enabled": false - }, - "FixYoutubeEmbeds": { - "enabled": false - }, - "ForceOwnerCrown": { - "enabled": false - }, - "FriendInvites": { - "enabled": false - }, - "FriendsSince": { - "enabled": false - }, - "FullSearchContext": { - "enabled": false - }, - "GameActivityToggle": { - "enabled": false - }, - "GifPaste": { - "enabled": false - }, - "GreetStickerPicker": { - "enabled": false - }, - "HideAttachments": { - "enabled": false - }, - "iLoveSpam": { - "enabled": false - }, - "IgnoreActivities": { - "enabled": false - }, - "ImageLink": { - "enabled": false - }, - "ImageZoom": { - "enabled": false - }, - "ImplicitRelationships": { - "enabled": false - }, - "InvisibleChat": { - "enabled": false - }, - "KeepCurrentChannel": { - "enabled": false - }, - "LastFMRichPresence": { - "enabled": false - }, - "LoadingQuotes": { - "enabled": false - }, - "MemberCount": { - "enabled": true, - "memberList": true, - "toolTip": true - }, - "MentionAvatars": { - "enabled": false - }, - "MessageClickActions": { - "enabled": false - }, - "MessageLatency": { - "enabled": false - }, - "MessageLinkEmbeds": { - "enabled": false - }, - "MessageLogger": { - "enabled": false - }, - "MessageTags": { - "enabled": false - }, - "MoreCommands": { - "enabled": false - }, - "MoreKaomoji": { - "enabled": true - }, - "MoreUserTags": { - "enabled": false - }, - "Moyai": { - "enabled": false - }, - "MutualGroupDMs": { - "enabled": false - }, - "NewGuildSettings": { - "enabled": false - }, - "NoBlockedMessages": { - "enabled": false - }, - "NoDevtoolsWarning": { - "enabled": false - }, - "NoF1": { - "enabled": false - }, - "NoMaskedUrlPaste": { - "enabled": false - }, - "NoMosaic": { - "enabled": false - }, - "NoOnboardingDelay": { - "enabled": false - }, - "NoPendingCount": { - "enabled": false - }, - "NoProfileThemes": { - "enabled": false - }, - "NoReplyMention": { - "enabled": false - }, - "NoScreensharePreview": { - "enabled": false - }, - "NoServerEmojis": { - "enabled": false - }, - "NoTypingAnimation": { - "enabled": false - }, - "NoUnblockToJump": { - "enabled": false - }, - "NormalizeMessageLinks": { - "enabled": false - }, - "NotificationVolume": { - "enabled": false - }, - "NSFWGateBypass": { - "enabled": false - }, - "OnePingPerDM": { - "enabled": false - }, - "oneko": { - "enabled": false - }, - "OpenInApp": { - "enabled": false - }, - "OverrideForumDefaults": { - "enabled": false - }, - "PartyMode": { - "enabled": false - }, - "PauseInvitesForever": { - "enabled": false - }, - "PermissionFreeWill": { - "enabled": false - }, - "PermissionsViewer": { - "enabled": false - }, - "petpet": { - "enabled": true - }, - "PictureInPicture": { - "enabled": false - }, - "PinDMs": { - "enabled": false - }, - "PlainFolderIcon": { - "enabled": false - }, - "PlatformIndicators": { - "enabled": false - }, - "PreviewMessage": { - "enabled": false - }, - "QuickMention": { - "enabled": false - }, - "QuickReply": { - "enabled": false - }, - "ReactErrorDecoder": { - "enabled": false - }, - "ReadAllNotificationsButton": { - "enabled": false - }, - "RelationshipNotifier": { - "enabled": false - }, - "ReplaceGoogleSearch": { - "enabled": false - }, - "ReplyTimestamp": { - "enabled": false - }, - "RevealAllSpoilers": { - "enabled": false - }, - "ReverseImageSearch": { - "enabled": false - }, - "ReviewDB": { - "enabled": false - }, - "RoleColorEverywhere": { - "enabled": false - }, - "SecretRingToneEnabler": { - "enabled": false - }, - "Summaries": { - "enabled": false - }, - "SendTimestamps": { - "enabled": true, - "replaceMessageContents": true - }, - "ServerInfo": { - "enabled": false - }, - "ServerListIndicators": { - "enabled": false - }, - "ShikiCodeblocks": { - "enabled": true, - "useDevIcon": "COLOR", - "theme": "https://raw.githubusercontent.com/shikijs/shiki/0b28ad8ccfbf2615f2d9d38ea8255416b8ac3043/packages/shiki/themes/dracula.json", - "tryHljs": "SECONDARY", - "bgOpacity": 100 - }, - "ShowAllMessageButtons": { - "enabled": false - }, - "ShowConnections": { - "enabled": false - }, - "ShowHiddenChannels": { - "enabled": false - }, - "ShowHiddenThings": { - "enabled": false - }, - "ShowMeYourName": { - "enabled": false - }, - "ShowTimeoutDuration": { - "enabled": false - }, - "SilentMessageToggle": { - "enabled": false - }, - "SilentTyping": { - "enabled": false - }, - "SortFriendRequests": { - "enabled": false - }, - "SpotifyControls": { - "enabled": false - }, - "SpotifyCrack": { - "enabled": false - }, - "SpotifyShareCommands": { - "enabled": false - }, - "StartupTimings": { - "enabled": false - }, - "StickerPaste": { - "enabled": false - }, - "StreamerModeOnStream": { - "enabled": false - }, - "SuperReactionTweaks": { - "enabled": false - }, - "TextReplace": { - "enabled": false - }, - "ThemeAttributes": { - "enabled": false - }, - "Translate": { - "enabled": false - }, - "TypingIndicator": { - "enabled": false - }, - "TypingTweaks": { - "enabled": false - }, - "Unindent": { - "enabled": false - }, - "UnlockedAvatarZoom": { - "enabled": false - }, - "UnsuppressEmbeds": { - "enabled": false - }, - "UserVoiceShow": { - "enabled": false - }, - "USRBG": { - "enabled": false - }, - "ValidReply": { - "enabled": false - }, - "ValidUser": { - "enabled": false - }, - "VoiceChatDoubleClick": { - "enabled": false - }, - "VcNarrator": { - "enabled": false - }, - "VencordToolbox": { - "enabled": false - }, - "ViewIcons": { - "enabled": false - }, - "ViewRaw": { - "enabled": false - }, - "VoiceDownload": { - "enabled": false - }, - "VoiceMessages": { - "enabled": false - }, - "VolumeBooster": { - "enabled": false - }, - "WebKeybinds": { - "enabled": true - }, - "WebScreenShareFixes": { - "enabled": true - }, - "WhoReacted": { - "enabled": false - }, - "XSOverlay": { - "enabled": false - }, - "YoutubeAdblock": { - "enabled": true - }, - "NoTrack": { - "enabled": true, - "disableAnalytics": true - }, - "WebContextMenus": { - "enabled": true, - "addBack": true - }, - "Settings": { - "enabled": true, - "settingsLocation": "aboveNitro" - }, - "SupportHelper": { - "enabled": true - }, - "UserMessagesPronouns": { - "enabled": true, - "showInMessages": true, - "showSelf": true, - "pronounSource": 0, - "pronounsFormat": "LOWERCASE" - }, - "DynamicImageModalAPI": { - "enabled": false - }, - "FixImagesQuality": { - "enabled": false - } - }, - "notifications": { - "timeout": 5000, - "position": "bottom-right", - "useNative": "not-focused", - "logLimit": 50 - }, - "cloud": { - "authenticated": false, - "url": "https://api.vencord.dev/", - "settingsSync": false, - "settingsSyncVersion": 1734993730812 - } -} \ No newline at end of file diff --git a/home-manager/hosts/EDI/default.nix b/home-manager/hosts/EDI/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/EDI/default.nix +++ b/home-manager/hosts/EDI/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/EDI/id_ed25519.pub b/home-manager/hosts/EDI/id_ed25519.pub deleted file mode 100644 index 9c0c307..0000000 --- a/home-manager/hosts/EDI/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 1922c62..351470d 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -19,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/GLaDOS/default.nix b/home-manager/hosts/GLaDOS/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/GLaDOS/default.nix +++ b/home-manager/hosts/GLaDOS/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/GLaDOS/id_ed25519.pub b/home-manager/hosts/GLaDOS/id_ed25519.pub deleted file mode 100644 index 6f641a9..0000000 --- a/home-manager/hosts/GLaDOS/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 4599605..c71456a 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -16,16 +23,15 @@ ]; home.packages = with pkgs; [ + heroic r2modman - ryujinx - lutris ]; programs.mangohud = { enable = true; - # enableSessionWide = true; + enableSessionWide = true; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/iso/default.nix b/home-manager/hosts/iso/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/iso/default.nix +++ b/home-manager/hosts/iso/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 1922c62..351470d 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -19,5 +26,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/iso_server/default.nix b/home-manager/hosts/iso_server/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/iso_server/default.nix +++ b/home-manager/hosts/iso_server/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/iso_server/lillian.nix b/home-manager/hosts/iso_server/lillian.nix index 2b344a4..9acd9c2 100644 --- a/home-manager/hosts/iso_server/lillian.nix +++ b/home-manager/hosts/iso_server/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -18,5 +25,5 @@ ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/queen/default.nix b/home-manager/hosts/queen/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/queen/default.nix +++ b/home-manager/hosts/queen/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/queen/id_ed25519.pub b/home-manager/hosts/queen/id_ed25519.pub deleted file mode 100644 index bf8d43c..0000000 --- a/home-manager/hosts/queen/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtwcWXnwOOI8G3NqAMfTeuSuDk9ly5xqwQDH2Iey3u+ lillian@queen diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index 9bd29f7..680ef4e 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -35,5 +42,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/shodan/default.nix b/home-manager/hosts/shodan/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/shodan/default.nix +++ b/home-manager/hosts/shodan/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/shodan/id_ed25519.pub b/home-manager/hosts/shodan/id_ed25519.pub deleted file mode 100644 index 2f2ee8f..0000000 --- a/home-manager/hosts/shodan/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL279XPFj1nzLDozFclntPh8rOcn3d1B5iJNGds9Ray6 lillian@shodan diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 38c0d3f..c37facd 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -16,8 +23,6 @@ ../../desktop/package-configs/firefox.nix ../../desktop/package-configs/konsole ../../desktop/package-configs/foot - ../../desktop/package-configs/freetube - ../../desktop/package-configs/vesktop ../../shared ]; nixpkgs = { @@ -47,7 +52,7 @@ home.packages = with pkgs; [ #Chat: - vesktop + webcord-vencord #Gaming: prismlauncher @@ -58,18 +63,17 @@ freetube obs-studio vlc - fcast-receiver - fcast-client # System tools: rage + discover flameshot fzf nextcloud-client nitrokey-app - # protonvpn-gui + protonvpn-gui sops - #watchmate + watchmate qbittorrent zsh @@ -86,29 +90,24 @@ firefox ungoogled-chromium ]; - programs = { - # # Automount services for user - # programs.bashmount.enable = true; - # services.udiskie = { - # enable = true; - # automount = true; - # notify = false; - # tray = "never"; - # }; - # Enable home-manager and git - home-manager.enable = true; - git = { - enable = true; - userEmail = "git@lillianviolet.dev"; - userName = "Lillian-Violet"; - signing.format = "ssh"; - }; + # # Automount services for user + # programs.bashmount.enable = true; + # services.udiskie = { + # enable = true; + # automount = true; + # notify = false; + # tray = "never"; + # }; + + # Enable home-manager and git + programs.home-manager.enable = true; + programs.git = { + enable = true; + userEmail = "git@lillianviolet.dev"; + userName = "Lillian-Violet"; }; - # Make the kde screenlock not require a password :) - programs.plasma.kscreenlocker.passwordRequired = false; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.11"; } diff --git a/home-manager/hosts/wheatley/default.nix b/home-manager/hosts/wheatley/default.nix index 2600642..c17b81a 100644 --- a/home-manager/hosts/wheatley/default.nix +++ b/home-manager/hosts/wheatley/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./lillian.nix diff --git a/home-manager/hosts/wheatley/id_ed25519.pub b/home-manager/hosts/wheatley/id_ed25519.pub deleted file mode 100644 index dbfe237..0000000 --- a/home-manager/hosts/wheatley/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxXVL6QAiMLwvUYBtXCbkHEh6ENgaEO/rkZWSPJrjLJ lillian@wheatley diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix index 9bd29f7..c3778c3 100644 --- a/home-manager/hosts/wheatley/lillian.nix +++ b/home-manager/hosts/wheatley/lillian.nix @@ -1,6 +1,13 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ # If you want to use modules your own flake exports (from modules/home-manager): @@ -11,7 +18,8 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ../../shared + ../../package-configs/zsh.nix + ../../package-configs/helix.nix ]; nixpkgs = { @@ -35,5 +43,5 @@ }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "25.05"; + home.stateVersion = "24.05"; } diff --git a/home-manager/kde-connect-commands.json b/home-manager/kde-connect-commands.json deleted file mode 100644 index e69e236..0000000 --- a/home-manager/kde-connect-commands.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "command": "systemctl poweroff", - "name": "shutdown" - }, - { - "command": "systemctl reboot", - "name": "reboot" - }, - { - "command": "systemctl suspend", - "name": "suspend" - }, - { - "command": "systemctl hibernate", - "name": "hibernate" - }, - { - "command": "loginctl lock-session", - "name": "lock" - }, - { - "command": "loginctl unlock-session", - "name": "unlock" - }, - { - "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mute\"", - "name": "mute" - }, - { - "command": "qdbus org.kde.kglobalaccel /component/kmix invokeShortcut \"mic_mute\"", - "name": "mute mic" - }, - { - "command": "file=/tmp/$(hostname)_$(date \"+%Y%m%d_%H%M%S\").png; spectacle -bo \"${file}\" && while ! [ -f \"${file}\" ]; do sleep 0.5; done && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", - "name": "screenshot to phone" - }, - { - "command": "file=\"$HOME/Images/WebcamImage_$(date \"+%Y%m%d_%H%M%S\").jpg\"; ffmpeg -f video4linux2 -s 1280x720 -i /dev/video0 -ss 0:0:2 -frames 1 \"${file}\" && kdeconnect-cli -d $(kdeconnect-cli -a --id-only) --share \"${file}\"", - "name": "webcam to phone" - }, - { - "command": "", - "name": "" - } -] diff --git a/home-manager/shared/background.jpg b/home-manager/shared/background.jpg deleted file mode 100644 index 2ad658c..0000000 Binary files a/home-manager/shared/background.jpg and /dev/null differ diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix index 5889b96..465a8ce 100644 --- a/home-manager/shared/default.nix +++ b/home-manager/shared/default.nix @@ -1,10 +1,12 @@ { + inputs, + outputs, + lib, + config, pkgs, - osConfig, ... }: { imports = [ - ./ssh ./shell/helix ./shell/zellij ./shell/zsh.nix @@ -12,78 +14,15 @@ ./shell/eza.nix ./shell/hyfetch.nix ]; - home = { username = "lillian"; homeDirectory = "/home/lillian"; - file."id_ed25519.pub" = { - source = ../hosts/${osConfig.networking.hostName}/id_ed25519.pub; - target = ".ssh/id_ed25519.pub"; - force = true; - }; - - packages = with pkgs; [ - # System tools: - vscode-langservers-extracted - sops - zsh - bat - btop - broot - lazygit - navi - nil - gh - ]; }; - catppuccin = { - flavor = "macchiato"; - btop.enable = true; - cache.enable = true; - chromium.enable = true; - freetube.enable = true; - freetube.flavor = "macchiato"; - }; - programs = { - navi.enable = true; - yazi = { - enable = true; - # package = pkgs.yazi.override { - # _7zz = pkgs._7zz.override {useUasm = true;}; - # }; - }; - }; - # stylix.enable = true; - # qt.platformTheme.name = lib.mkForce "kvantum"; - # qt.style.name = lib.mkForce "kvantum"; - - # stylix = { - # enable = true; - # autoEnable = true; - # base16Scheme = { - # scheme = "Catppuccin Macchiato"; - # author = "https://github.com/catppuccin/catppuccin"; - # base00 = "24273a"; - # base01 = "1e2030"; - # base02 = "363a4f"; - # base03 = "494d64"; - # base04 = "5b6078"; - # base05 = "cad3f5"; - # base06 = "f4dbd6"; - # base07 = "b7bdf8"; - # base08 = "ed8796"; - # base09 = "f5a97f"; - # base0A = "eed49f"; - # base0B = "a6da95"; - # base0C = "8bd5ca"; - # base0D = "8aadf4"; - # base0E = "c6a0f6"; - # base0F = "f0c6c6"; - # }; - # image = ./background.jpg; - # cursor.package = pkgs.catppuccin-cursors; - # cursor.name = "catppuccin-macchiato-mauve-cursors"; - # cursor.size = 16; - # }; + home.packages = with pkgs; [ + # System tools: + sops + zsh + bat + ]; } diff --git a/home-manager/shared/shell/bat.nix b/home-manager/shared/shell/bat.nix index 8658a54..21acc30 100644 --- a/home-manager/shared/shell/bat.nix +++ b/home-manager/shared/shell/bat.nix @@ -1,7 +1,11 @@ -{pkgs, ...}: { +{ + lib, + pkgs, + ... +}: { programs.bat = { enable = true; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; - # catppuccin.enable = true; + catppuccin.enable = true; }; } diff --git a/home-manager/shared/shell/eza.nix b/home-manager/shared/shell/eza.nix index df2968b..b0c72f2 100644 --- a/home-manager/shared/shell/eza.nix +++ b/home-manager/shared/shell/eza.nix @@ -1,4 +1,4 @@ -{...}: { +{lib, ...}: { programs.eza = { enable = true; enableZshIntegration = true; diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 249254b..ae6d948 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -1,58 +1,16 @@ -{pkgs, ...}: let - yazi = - pkgs.writeText "open_in_helix_from_yazi.zsh" - '' - #! ~/.nix-profile/bin/zsh - files=(''${(fqq)"$( yazi --chooser-file=/dev/stdout | cat )"}) - zellij action toggle-floating-panes - zellij action write 27 # send escape-key - zellij action write-chars ":open $files" - zellij action write 13 # send enter-key - zellij action toggle-floating-panes - zellij action close-pane - ''; - jupyter = - pkgs.writeText "run_jupyter_from_helix.zsh" - '' - #! ~/.nix-profile/bin/zsh - is_new() { - new=0; - mkdir -p /tmp/rjh; - if [[ -a "/tmp/rjh/$(pwd | tr \"/\" -).json" ]]; then - new=1 - fi - return $new - } - - is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh/$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && sleep 3 - rm -f /tmp/pipe-rjh - mkfifo /tmp/pipe-rjh - cat > /tmp/pipe-rjh - zellij run -f -n "REPL" -- direnv exec . just send < /tmp/pipe-rjh - rm /tmp/pipe-rjh - - ''; -in { +{ + config, + lib, + pkgs, + ... +}: { programs.helix = { enable = true; defaultEditor = true; settings = { - # theme = "catppuccin_macchiato"; # Don't need this because the module themes it for us - keys.normal.backspace = { - b = ":sh zellij run -f -n 'build code' -- direnv exec . just build"; - r = ":sh zellij run -f -n 'run code' -- direnv exec . just run"; - t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; - g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; - f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; - j = ":pipe-to just jupyter"; - }; + theme = "catppuccin_macchiato"; editor = { - auto-save = { - focus-lost = true; - after-delay.enable = true; - after-delay.timeout = 3000; - }; line-number = "relative"; lsp.display-messages = true; lsp.display-inlay-hints = true; @@ -78,7 +36,7 @@ in { language-id = "python"; auto-format = true; file-types = ["py"]; - language-servers = ["ruff" "scls" "pylsp"]; + language-servers = ["ruff" "scls"]; } { name = "typst"; @@ -116,58 +74,8 @@ in { args = ["-q"]; }; } - { - name = "html"; - language-id = "html"; - auto-format = true; - file-types = ["htm" "html"]; - language-servers = ["vscode-html-language-server" "vscode-eslint-language-server"]; - } - { - name = "css"; - language-id = "css"; - auto-format = true; - file-types = ["css"]; - language-servers = ["vscode-css-language-server" "vscode-eslint-language-server"]; - } - { - name = "json"; - language-id = "json"; - auto-format = true; - file-types = ["json"]; - language-servers = ["vscode-json-language-server" "vscode-eslint-language-server"]; - } ]; language-server = { - vscode-html-language-server = { - command = "vscode-html-language-server"; - }; - vscode-css-language-server = { - command = "vscode-css-language-server"; - }; - vscode-eslint-language-server = { - command = "vscode-eslint-language-server"; - }; - vscode-json-language-server = { - command = "vscode-json-language-server"; - }; - pylsp = { - config.pylsp.plugins = { - flake8 = {enabled = false;}; - autopep8 = {enabled = false;}; - mccabe = {enabled = false;}; - pycodestyle = {enabled = false;}; - pyflakes = {enabled = false;}; - pylint = {enabled = false;}; - yapf = {enabled = false;}; - ruff = { - enabled = true; - select = ["E" "F" "UP" "B" "SIM" "I" "PD" "NPY" "PERF" "FURB" "DOC" "TRY" "W" "R" "PL" "TCH" "Q" "PT" "ICN" "C4" "COM" "FBT" "S" "N"]; - ignore = ["F401"]; - lineLength = 120; - }; - }; - }; ruff = { command = "ruff-lsp"; }; @@ -200,17 +108,4 @@ in { target = ".config/helix/external-snippets.toml"; }; }; - - home.file = { - "yazi" = { - source = "${yazi}"; - target = ".config/helix/open_in_helix_from_yazi.zsh"; - }; - }; - home.file = { - "jupyter" = { - source = "${jupyter}"; - target = ".config/helix/run_jupyter_from_helix.zsh"; - }; - }; } diff --git a/home-manager/shared/shell/helix/helix.nix b/home-manager/shared/shell/helix/helix.nix deleted file mode 100644 index bbadd82..0000000 --- a/home-manager/shared/shell/helix/helix.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - fetchzip, - lib, - rustPlatform, - git, - installShellFiles, -}: -rustPlatform.buildRustPackage rec { - pname = "helix"; - version = "25.01.1"; - - # This release tarball includes source code for the tree-sitter grammars, - # which is not ordinarily part of the repository. - src = fetchzip { - url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = ""; - stripRoot = false; - }; - - useFetchCargoVendor = true; - cargoHash = ""; - - nativeBuildInputs = [git installShellFiles]; - - env.HELIX_DEFAULT_RUNTIME = "${placeholder "out"}/lib/runtime"; - - postInstall = '' - # not needed at runtime - rm -r runtime/grammars/sources - - mkdir -p $out/lib - cp -r runtime $out/lib - installShellCompletion contrib/completion/hx.{bash,fish,zsh} - mkdir -p $out/share/{applications,icons/hicolor/256x256/apps} - cp contrib/Helix.desktop $out/share/applications - cp contrib/helix.png $out/share/icons/hicolor/256x256/apps - ''; - - meta = with lib; { - description = "Post-modern modal text editor"; - homepage = "https://helix-editor.com"; - license = licenses.mpl20; - mainProgram = "hx"; - maintainers = with maintainers; [danth yusdacra zowoq]; - }; -} diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 774a3d7..0945e59 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -1,4 +1,9 @@ -{...}: { +{ + config, + lib, + pkgs, + ... +}: { programs.hyfetch = { enable = true; settings = { diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix index 90dda44..4cbba8e 100644 --- a/home-manager/shared/shell/starship.nix +++ b/home-manager/shared/shell/starship.nix @@ -35,6 +35,7 @@ git_branch.style = "bold blue"; directory.style = "bold blue"; direnv.disabled = false; + palette = "catppuccin_${flavor}"; } // builtins.fromTOML (builtins.readFile (pkgs.fetchFromGitHub diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index d8bebaf..540cfec 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -1,4 +1,5 @@ { + lib, pkgs, inputs, ... @@ -53,89 +54,6 @@ } } - default_tab_template { - pane size=1 borderless=true { - plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { - format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" - format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" - - mode_locked "#[fg=magenta,bold] {name} " - mode_normal "#[fg=green,bold] {name} " - mode_resize "#[fg=orange,bold] {name} " - mode_default_to_mode "resize" - - tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" - tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" - - tab_sync_indicator " " - tab_fullscreen_indicator "□ " - tab_floating_indicator "󰉈 " - - datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " - datetime_format "%Y-%m-%d %H:%M" - datetime_timezone "Europe/Amsterdam" - } - } - children - pane size=2 borderless=true { - plugin location="status-bar" - } - } - } - ''; - helix_zellij = - pkgs.writeText "helix.kdl" - '' - layout { - tab { - pane { - command "hx" - args "." - } - pane split_direction="vertical" size="20%" {} - } - swap_tiled_layout name="vertical" { - tab max_panes=5 { - pane split_direction="vertical" { - pane - pane { children; } - } - } - tab max_panes=8 { - pane split_direction="vertical" { - pane { children; } - pane { pane; pane; pane; pane; } - } - } - tab max_panes=12 { - pane split_direction="vertical" { - pane { children; } - pane { pane; pane; pane; pane; } - pane { pane; pane; pane; pane; } - } - } - } - - swap_tiled_layout name="horizontal" { - tab max_panes=5 { - pane - pane - } - tab max_panes=8 { - pane { - pane split_direction="vertical" { children; } - pane split_direction="vertical" { pane; pane; pane; pane; } - } - } - tab max_panes=12 { - pane { - pane split_direction="vertical" { children; } - pane split_direction="vertical" { pane; pane; pane; pane; } - pane split_direction="vertical" { pane; pane; pane; pane; } - } - } - } - default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -172,55 +90,18 @@ in { # TODO find specific settings for vscode to avoid enable = true; enableZshIntegration = true; - settings = { - session_serialization = true; - # theme = "catppuccin-macchiato"; - - themes = { - catppuccin-mocha = { - bg = "#585b70"; - fg = "#cdd6f4"; - red = "#f38ba8"; - green = "#a6e3a1"; - blue = "#89b4fa"; - yellow = "#f9e2af"; - magenta = "#f5c2e7"; - orange = "#fab387"; - cyan = "#89dceb"; - black = "#181825"; - white = "#cdd6f4"; - }; - catppuccin-macchiato = { - bg = "#5b6078"; - fg = "#cad3f5"; - red = "#ed8796"; - green = "#a6da95"; - blue = "#8aadf4"; - yellow = "#eed49f"; - magenta = "#f5bde6"; - orange = "#f5a97f"; - cyan = "#91d7e3"; - black = "#1e2030"; - white = "#cad3f5"; - }; - }; - }; }; + home.file = { "layout" = { source = "${layout}"; target = ".config/zellij/layouts/default.kdl"; }; - - "helix_zellij" = { - source = "${helix_zellij}"; - target = ".config/zellij/layouts/helix.kdl"; + }; + home.file = { + "config" = { + source = ./zellij.kdl; + target = ".config/zellij/config.kdl"; }; }; - #home.file = { - # "config" = { - # source = ./zellij.kdl; - # target = ".config/zellij/config.kdl"; - # }; - #}; } diff --git a/home-manager/shared/shell/zsh.nix b/home-manager/shared/shell/zsh.nix index 7579669..d68ee10 100644 --- a/home-manager/shared/shell/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -1,71 +1,67 @@ -{pkgs, ...}: { - programs = { - zoxide = { - enable = true; +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + programs.zoxide = { + enable = true; + }; + + programs.zsh = { + enable = true; + shellAliases = { + cd = "z"; + code = "codium ./"; + ls = "eza"; + lh = "ls -lah"; + cat = "bat"; + tree = "tre"; + neofetch = "hyfetch"; + shutdown = "shutdown 0"; + reboot = "reboot 0"; }; - zsh = { + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.8.0"; + sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; + }; + } + ]; + autosuggestion.enable = true; + enableCompletion = true; + historySubstringSearch.enable = true; + syntaxHighlighting.enable = true; + #zsh-abbr.enable = true; + oh-my-zsh = { enable = true; - shellAliases = { - cd = "z"; - code = "codium ./"; - ls = "eza"; - lh = "ls -lah"; - cat = "bat"; - tree = "tre"; - neofetch = "hyfetch"; - shutdown = "shutdown 0"; - reboot = "reboot 0"; - }; plugins = [ - { - name = "zsh-nix-shell"; - file = "nix-shell.plugin.zsh"; - src = pkgs.fetchFromGitHub { - owner = "chisui"; - repo = "zsh-nix-shell"; - rev = "v0.8.0"; - sha256 = "sha256-Z6EYQdasvpl1P78poj9efnnLj7QQg13Me8x1Ryyw+dM="; - }; - } - { - name = "terraform"; - src = pkgs.fetchFromGitHub { - owner = "macunha1"; - repo = "zsh-terraform"; - rev = "fd1471d3757f8ed13f56c4426f88616111de2a87"; - sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc"; - }; - } + "git" + "colored-man-pages" + "colorize" + "dirhistory" + "dirpersist" + "history" + "history-substring-search" + "fancy-ctrl-z" + "git-flow" + "isodate" + "z" + "zsh-interactive-cd" + "zsh-navigation-tools" ]; - autosuggestion.enable = true; - enableCompletion = true; - historySubstringSearch.enable = true; - syntaxHighlighting.enable = true; - #zsh-abbr.enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "colored-man-pages" - "colorize" - "dirhistory" - "dirpersist" - "history" - "history-substring-search" - "fancy-ctrl-z" - "git-flow" - "isodate" - "z" - "zsh-interactive-cd" - "zsh-navigation-tools" - ]; - }; - # Extra commands that take more complex forms - initContent = '' - eval "$(zoxide init --cmd cd zsh)" - tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } - zhx() { command zellij action new-tab --layout $HOME/.config/zellij/layouts/helix.kdl; } - ''; }; + # stuff for zoxide & tre + initExtra = '' + eval "$(zoxide init --cmd cd zsh)" + tre() { command tre "$@" -e && source "/tmp/tre_aliases_$USER" 2>/dev/null; } + ''; }; } diff --git a/home-manager/shared/ssh/config b/home-manager/shared/ssh/config deleted file mode 100644 index 9469604..0000000 --- a/home-manager/shared/ssh/config +++ /dev/null @@ -1,25 +0,0 @@ -Host wheatley -HostName 10.0.0.1 -User lillian -Port 22 - -Host GLaDOS -HostName 10.0.0.2 -User lillian -Port 22 - -Host EDI -HostName 10.0.0.3 -User lillian -Port 22 - -Host shodan -HostName 10.0.0.4 -User lillian -Port 22 - -Host queen -HostName gladtherescake.eu -User lillian -Port 22 - diff --git a/home-manager/shared/ssh/default.nix b/home-manager/shared/ssh/default.nix deleted file mode 100644 index aef7a98..0000000 --- a/home-manager/shared/ssh/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - home.file."sshconfig" = { - source = ./config; - target = ".config/ssh/config"; - force = true; - }; -} diff --git a/justfile b/justfile deleted file mode 100644 index 60f43e4..0000000 --- a/justfile +++ /dev/null @@ -1,24 +0,0 @@ -build: - sudo echo "sudo check..." && sudo nixos-rebuild --log-format internal-json -v switch --flake .# --show-trace |& nom --json - -run: - nix-repl -f flake:nixpkgs - -test: - sudo echo "sudo check..." && sudo nix flake check --show-trace --log-format internal-json -v |& nom --json - -update: - nix flake update --log-format internal-json -v |& nom --json && zsh - -clean: - sudo nix-collect-garbage - sudo nix-store --optimise - -setup: - echo "just test" >> ./.git/hooks/pre-commit && chmod +x ./.git/hooks/pre-commit - -push: - git pull - git add * - read -p "Commit message: " -r message && git commit -m "$message" - git push diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 4be86f1..8685807 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,5 +1,6 @@ # Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). # These should be stuff you would like to share with others, not your personal configurations. { - vpn-ip = import ./vpn-ip; + # List your module files here + contabo.wan = import ./contabo/wan; } diff --git a/modules/nixos/vpn-ip/default.nix b/modules/nixos/vpn-ip/default.nix deleted file mode 100644 index 71d56a6..0000000 --- a/modules/nixos/vpn-ip/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{lib, ...}: -with lib; { - # Declare what settings a user of this "hello.nix" module CAN SET. - options.services.vpn-ip = { - enable = mkOption { - type = types.bool; - default = true; - }; - ip = mkOption { - type = types.str; - default = "0"; - }; - publicKey = mkOption { - type = types.str; - default = ""; - }; - }; -} diff --git a/nixos/board/package-configs/pi-hole/default.nix b/nixos/board/package-configs/pi-hole/default.nix index 0596d3b..7ce2716 100644 --- a/nixos/board/package-configs/pi-hole/default.nix +++ b/nixos/board/package-configs/pi-hole/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { services.pihole = { enable = true; hostConfig = { diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index ac4febd..791cdaf 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -1,6 +1,7 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { + inputs, outputs, lib, config, @@ -16,9 +17,9 @@ nixpkgs = { # You can add overlays here overlays = [ - #(final: prev: { - #bcachefs-tools = pkgs-edge.bcachefs-tools; - #}) + (final: prev: { + bcachefs-tools = pkgs-edge.bcachefs-tools; + }) # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications @@ -29,6 +30,11 @@ }; }; + # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently + programs.command-not-found.enable = lib.mkForce false; + programs.nix-index.enable = true; + programs.nix-index-database.comma.enable = true; + environment.systemPackages = (with pkgs; [ # Custom tools @@ -39,12 +45,10 @@ # System tools aha - #bcachefs-tools + bcachefs-tools clinfo comma direnv - exfat - exfatprogs git-filter-repo gnupg pciutils @@ -55,32 +59,26 @@ tpm2-tss virtualgl vulkan-tools - # waydroid + waydroid waypipe wayland-utils + xwaylandvideobridge yubikey-personalization zsh # KDE/QT krunner-translator kdePackages.discover - kdePackages.filelight kdePackages.kcalc kdePackages.kdepim-addons kdePackages.kirigami kdePackages.kdeconnect-kde - kdePackages.konsole # kdePackages.krunner-ssh # kdePackages.krunner-symbols kdePackages.packagekit-qt kdePackages.plasma-pa kdePackages.sddm-kcm kdePackages.dolphin-plugins - kdePackages.qtstyleplugin-kvantum - kdePackages.krdc - kdePackages.krfb - kdePackages.kate - kdePackages.xwaylandvideobridge libportal-qt5 libportal @@ -88,140 +86,108 @@ noisetorch qjackctl wireplumber - #rustdesk + rustdesk ]) ++ (with pkgs-edge; [ - freetube # list of latest packages from nixpkgs master # Can be used to install latest version of some packages ]); - sops = { - secrets."nextcloud-password" = { - mode = "0600"; - owner = config.users.users.lillian.name; - path = "/home/lillian/.netrc"; - }; - }; - programs = { - # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently - command-not-found.enable = lib.mkForce false; - # nix-index.enable = true; - # nix-index-database.comma.enable = true; - - direnv = { - enable = true; - }; - - steam = { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - extest.enable = true; - }; - kdeconnect.enable = true; - - noisetorch = { - enable = true; - }; + programs.direnv = { + enable = true; }; # Enable networking - networking.networkmanager.enable = true; # Enables support for 32bit libs that steam uses + networking.networkmanager.enable = true; + + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + extest.enable = true; + }; + hardware.graphics.enable32Bit = true; # Enables support for 32bit libs that steam uses # Set your time zone. time.timeZone = "Europe/Amsterdam"; - services = { - # Enable the X11 windowing system. - xserver.enable = true; - # Enable the KDE Plasma Desktop Environment. - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - displayManager.defaultSession = "plasma"; - desktopManager.plasma6.enable = true; - desktopManager.plasma6.notoPackage = pkgs.atkinson-hyperlegible; + # Enable the X11 windowing system. + services.xserver.enable = true; - # Enable flatpak support - flatpak.enable = true; - packagekit.enable = true; - - # Configure keymap in X11 - xserver.xkb = { - layout = "us"; - variant = ""; - options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; - }; - - # Enable CUPS to print documents. - printing.enable = true; - - # Enable fwupd daemon and user space client - fwupd.enable = true; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - wireplumber.enable = true; - }; - - avahi = { - nssmdns4 = true; - enable = true; - ipv4 = true; - ipv6 = true; - publish = { - enable = true; - addresses = true; - workstation = true; - }; - }; + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm = { + enable = true; + wayland.enable = true; }; - hardware = { - graphics.enable32Bit = true; + services.displayManager.defaultSession = "plasma"; + services.desktopManager.plasma6.enable = true; + programs.kdeconnect.enable = true; - # Enable bluetooth hardware - bluetooth.enable = true; + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver.xkb = { + layout = "us"; + variant = ""; + options = "terminate:ctrl_alt_bksp,compose:caps_toggle"; }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + wireplumber.enable = true; + }; + + programs.noisetorch = { + enable = true; + }; - services.pulseaudio.enable = false; virtualisation.podman = { enable = true; dockerCompat = true; }; - security.tpm2 = { - enable = true; - pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - tctiEnvironment.enable = true; - }; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables - users.users.lillian.extraGroups = ["tss"]; - boot = { - # tss group has access to TPM devices - bootspec.enable = true; - binfmt.emulatedSystems = ["aarch64-linux"]; - #boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - #boot.supportedFilesystems = ["bcachefs"]; - extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; - kernelModules = [ - # Virtual Camera - "v4l2loopback" - # Virtual Microphone, built-in - "snd-aloop" - ]; - # Set initial kernel module settings - extraModprobeConfig = '' - # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming - # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams - # https://github.com/umlaeute/v4l2loopback - options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" - ''; - loader.systemd-boot.configurationLimit = 3; - loader.efi.canTouchEfiVariables = true; - }; + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + users.users.lillian.extraGroups = ["tss"]; # tss group has access to TPM devices + + # FIXME: re-enable virtual camera loopback when it build again. + boot.bootspec.enable = true; + boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + boot.supportedFilesystems = ["bcachefs"]; + boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; + boot.kernelModules = [ + # Virtual Camera + "v4l2loopback" + # Virtual Microphone, built-in + "snd-aloop" + ]; + # Set initial kernel module settings + boot.extraModprobeConfig = '' + # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming + # card_label: Name of virtual camera, how it'll show up in Skype, Zoom, Teams + # https://github.com/umlaeute/v4l2loopback + options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + ''; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; } diff --git a/nixos/desktop/package-configs/default.nix b/nixos/desktop/package-configs/default.nix index 372d666..95564cd 100644 --- a/nixos/desktop/package-configs/default.nix +++ b/nixos/desktop/package-configs/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { imports = [ ./firefox ]; diff --git a/nixos/desktop/package-configs/firefox/default.nix b/nixos/desktop/package-configs/firefox/default.nix index 95b8aad..9324703 100644 --- a/nixos/desktop/package-configs/firefox/default.nix +++ b/nixos/desktop/package-configs/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.floorp; + package = pkgs.firefox; policies = { DisableTelemetry = true; DisableFirefoxStudies = true; @@ -28,16 +28,16 @@ }; ExtensionSettings = { # "*".installation_mode = "blocked"; # blocks all addons except the ones specified below - # Catppuccin Macchiato - Mauve theme: - "{55750c61-e5f3-4d9a-898d-0643b3093678}" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-mauve/latest.xpi"; + # Catppuccin Macchiato - Lavender theme: + "{6396519b-0923-41a4-948a-3cb54a3918b3}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-macchiato-lavender/latest.xpi"; installation_mode = "force_installed"; }; # Sideberry: - #"{3c078156-979c-498b-8990-85f7987dd929}" = { - # install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; - # installation_mode = "force_installed"; - #}; + "{3c078156-979c-498b-8990-85f7987dd929}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/sidebery/latest.xpi"; + installation_mode = "force_installed"; + }; # Privacy Badger: "jid1-MnnxcxisBPnSXQ@jetpack" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi"; @@ -118,16 +118,6 @@ install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; installation_mode = "force_installed"; }; - # Tree Style Tabs - "treestyletab@piro.sakura.ne.jp" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/tree-style-tab/latest.xpi"; - installation_mode = "force_installed"; - }; - # Adaptive Tab Bar Colour - "ATBC@EasonWong" = { - install_url = "https://addons.mozilla.org/firefox/downloads/latest/Adaptive-Tab-Bar-Colour/latest.xpi"; - installation_mode = "force_installed"; - }; }; FirefoxHome = { Search = true; @@ -147,21 +137,12 @@ "browser.compactmode.show" = true; "browser.uidensity" = 0; # "browser.newtabpage.activity-stream.feeds.topsites" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; + # "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "font.name.serif.x-western" = "Crimson"; "font.name.sans-serif.x-western" = "Atkinson Hyperlegible"; "font.name.monospace.x-western" = "FiraCode Nerd Font"; "font.size.variable.x-western" = 14; - "floorp.browser.sidebar.useIconProvider" = "duckduckgo"; - "floorp.browser.tabbar.settings" = 2; - "floorp.browser.tabs.verticaltab" = true; - "floorp.tabbar.style" = 2; - "floorp.browser.user.interface" = 8; "signon.rememberSignons" = true; - "browser.ml.chat.enabled" = false; - "browser.ml.chat.shortcuts" = false; }; # TODO: switch to ManagedBookmarks as this will be dropped at some point https://mozilla.github.io/policy-templates/#managedbookmarks # Bookmarks = [ diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix index d52551f..78ee9f7 100644 --- a/nixos/hosts/EDI/configuration.nix +++ b/nixos/hosts/EDI/configuration.nix @@ -1,13 +1,17 @@ # This is your system's configuration file. # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { + inputs, outputs, lib, + config, pkgs, ... }: { # You can import other NixOS modules here imports = [ + # Import home-manager's NixOS module + inputs.home-manager.nixosModules.home-manager # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -18,44 +22,41 @@ # You can also split up your configuration and import pieces of it here: # ./users.nix - outputs.nixosModules.vpn-ip + ../../desktop ../../../disko/EDI + + # Import your generated (nixos-generate-config) hardware configuration + ./hardware-configuration.nix ]; + sops.defaultSopsFile = ./secrets/sops.yaml; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/EDI; + }; + }; + environment.systemPackages = with pkgs; [ ]; - services.vpn-ip = { - ip = "3"; - }; + networking.hostName = "EDI"; - networking = { - hostName = "EDI"; - networkmanager.enable = true; - }; + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + boot.loader.systemd-boot.enable = lib.mkForce false; + boot.initrd.systemd.enable = true; - hardware.enableAllFirmware = true; - hardware.enableRedistributableFirmware = true; - - boot = { - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - loader.systemd-boot.enable = lib.mkForce false; - initrd.systemd.enable = true; - - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - kernelModules = [ - "iwlmvm" - "iwlwifi" - ]; + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/EDI/hardware-configuration.nix b/nixos/hosts/EDI/hardware-configuration.nix index 40ca9e0..081b9c8 100644 --- a/nixos/hosts/EDI/hardware-configuration.nix +++ b/nixos/hosts/EDI/hardware-configuration.nix @@ -4,6 +4,7 @@ { config, lib, + pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/EDI/secrets/sops.yaml b/nixos/hosts/EDI/secrets/sops.yaml index 4db54a6..195607f 100644 --- a/nixos/hosts/EDI/secrets/sops.yaml +++ b/nixos/hosts/EDI/secrets/sops.yaml @@ -1,7 +1,4 @@ lillian-password: ENC[AES256_GCM,data:0mwqnvA+xrDD/m6uQtPbo9MpcFsOoqHE+Cg2gF6xZzNsqM3i/OmvAe7syp+mGBacZ3avoIHowLSWgXUkMcuFPeYa6XRkrX4LhA==,iv:f1kB54k6ZYWKlZ0Zowu8fOD0cf2WvNlX3GSpy1sUMdA=,tag:dsusc45E1BmYsNmiPzNccg==,type:str] -wg-private-key: ENC[AES256_GCM,data:CqXlIN0gKzMrZRJycAf96LUVNw9yCZpHtE8XP+JwV2Ftip46iUksg1uExxQ=,iv:LdcopSz8Hx5hO1M00B8r+C7XViwpjGOpvmoXUHIkFtc=,tag:rbskx98YjcYV1lB8OO2VxQ==,type:str] -nextcloud-password: ENC[AES256_GCM,data:h93FmVY3XZdRZECEzz5ArBPnuRYyp0kJ6UUoxKmWVuVeFVkOzxQ5dGra6R/jZg8ofjhu+WosoDso3S/i,iv:J1K2NMAjv7Y26q91V/f11gNs82/UD6jbrMy0hVh81pw=,tag:/mQFulslQ3Mqabnc0mb1lQ==,type:str] -ssh-private-key: ENC[AES256_GCM,data:AYyOFlqcNrlTnKSewgb8B/XzegkJGB79gUT419n6aYiH0xom+DmxfRqQm46x/fldlSeN8u2mmzisC6xcRt3fnK4+0gN5Ywvr6hQEtKKxu2N6Pj7+tFLvFmbYPFplecyGBs1S092UXL65ozQs8aYbogoXxVTVu6/MuCsks9UO1JQWq5utCAyU8VGc0/Ft4OZN2qUbS+VZ0ONZ0WzBA+s+CFZ1FNKsr4tvltLXf8fgpsiSHLUigS4rojlxm84+w8omE1IwpAOxOa9n9X1EDuPxrQvZ+LvcJcgwqrtU2HVGis1GfytPM6vRAoVdBKX37enXelPBX2z9W7wPtmTxippD7yzcEJOggJ6ETMUessNKm3yBsMzTcojSWYzHo4v3San1I+ZiNxjvykuHmomRhXdzdM/2RsBpev8q2sC9YU4euzjzCQdwfoNqhbqyN/1X2BOkJMceMqw8fD8nLc3mIbczMFNO6ByVocZ+iC9BvaBYeLrFd3gncqGRRCJdBCD5CYiOYcdIAipNGL7NQVhM1tcv,iv:RZKsKCENIKhIWo4aKyDVj9xx0GfdjhYLP0B2Rad2LSM=,tag:XOOxsyGidnKWzgGlUPmvXw==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +14,8 @@ sops: eUZ6b09pYlRVWFBuUm1Ua2l6Z0dacW8KeQdAVsxXsDiDMtFA2koSpDsw7Ib63vA0 GE/ubWDwwRc7wMPFGuofIe6TaDSFgtVXza+yo+i4y51+BOpwqxlYYA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-09T23:59:45Z" - mac: ENC[AES256_GCM,data:DQ8uXsVkbzc1JrMDaTGHb9ijRB//6I6GN4bAU1LWnhyxGA2QjYEk5xwEI1950kroXVf1hDTw5fdh+MXvvEcNUL6BZOc4Ecl5lPliZ4aemjhz+O8FCkSbnW2o5JnV4m/rFe9CP6KaoFdr/tgSBVklzaUE4Qdo1DUWCfF7XssXECw=,iv:gb1b569ar5wlc2XMkLXnYfyVp/ZMsLjh9cXM85GrUz0=,tag:MGFgFcF4jIdJxteiFp2n/Q==,type:str] + lastmodified: "2024-02-21T10:15:11Z" + mac: ENC[AES256_GCM,data:AnQfufrAVvN2f2kr2KLM8toFj4BUxM1xvwH48DE1OcoenBlzQHu76R35cc9q0rJjOBWXYnZPLEHncE46XyXt56HPboH/blIEZwa9aL1pwDOV5UwbaqZTuSy7/Ylnn0ZoZtcD4gFnavWBT9iUgu3VjRso1i6eXm0Lc1mvwRbH63M=,iv:zJW4Bzm+IGzgxsFE7QP+E4RY5UoPWTUeo9RfoLpbSt8=,tag:E29Pnjtp0w05hdEQCmkj7A==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.8.1 diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index f225830..9b79122 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -3,6 +3,8 @@ { inputs, outputs, + lib, + config, pkgs, ... }: { @@ -10,8 +12,6 @@ imports = [ # Import home-manager's NixOS module inputs.home-manager.nixosModules.home-manager - outputs.nixosModules.vpn-ip - inputs.jovian.nixosModules.jovian # If you want to use modules your own flake exports (from modules/nixos): # outputs.nixosModules.example @@ -30,74 +30,62 @@ ./hardware-configuration.nix ]; + sops.defaultSopsFile = ./secrets/sops.yaml; + environment.systemPackages = with pkgs; [ ]; - services.vpn-ip = { - ip = "2"; + services.xserver.videoDrivers = ["amdgpu"]; + + # Add vulkan support to GPU + hardware.graphics.extraPackages = with pkgs; [ + amdvlk + ]; + # For 32 bit applications + hardware.graphics.extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + + programs.gamemode = { + enable = true; + settings = { + general = { + renice = 10; + }; + + # Warning: GPU optimisations have the potential to damage hardware + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 0; + amd_performance_level = "high"; + }; + + custom = { + start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; + end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; + }; + }; + }; + + boot.loader.systemd-boot.enable = true; + + # boot.lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; + + users.users.lillian.extraGroups = ["gamemode"]; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/GLaDOS; + }; }; networking.hostName = "GLaDOS"; - services.xserver.videoDrivers = ["amdgpu"]; - hardware = { - # Add vulkan support to GPU - graphics.extraPackages = with pkgs; [ - amdvlk - ]; - # For 32 bit applications - graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - }; - programs = { - # gamemode.enable = false; - # gamemode.settings = { - # general = { - # renice = 10; - # }; - - # # Warning: GPU optimisations have the potential to damage hardware - # # gpu = { - # # apply_gpu_optimisations = "accept-responsibility"; - # # gpu_device = 0; - # # amd_performance_level = "high"; - # # }; - - # custom = { - # start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; - # end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; - # }; - # }; - }; - - jovian = { - steam = { - enable = true; - autoStart = false; - user = "lillian"; - desktopSession = "plasma"; - }; - decky-loader = { - enable = true; - package = pkgs.decky-loader-prerelease; - extraPackages = [pkgs.python3]; - }; - hardware.has.amd.gpu = true; - }; - boot = { - loader.systemd-boot.enable = false; - - binfmt.emulatedSystems = ["aarch64-linux"]; - - lanzaboote = { - enable = true; - pkiBundle = "/var/lib/sbctl"; - }; - }; - - users.users.lillian.extraGroups = ["gamemode"]; - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/GLaDOS/hardware-configuration.nix b/nixos/hosts/GLaDOS/hardware-configuration.nix index 7c7fcbd..c4ee5ec 100644 --- a/nixos/hosts/GLaDOS/hardware-configuration.nix +++ b/nixos/hosts/GLaDOS/hardware-configuration.nix @@ -4,6 +4,7 @@ { config, lib, + pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/GLaDOS/secrets/sops.yaml b/nixos/hosts/GLaDOS/secrets/sops.yaml index d2521b7..66274e0 100644 --- a/nixos/hosts/GLaDOS/secrets/sops.yaml +++ b/nixos/hosts/GLaDOS/secrets/sops.yaml @@ -1,7 +1,4 @@ lillian-password: ENC[AES256_GCM,data:aHJCYmnpGIWJMsNZ8aw51Rquuv4F7kgGvfIxHMELuDlEqgjkg+SAhh+UQEpv16F0WVxrYZ/EwxKFMBpfPv9M2NLZC98bav0D9g==,iv:uzYLfmxG46ubmgeFsfW7aqXZbcL+TQw0VdDcklV0/ZI=,tag:Ozcf5qXC7xh0VcsBzhyo2g==,type:str] -wg-private-key: ENC[AES256_GCM,data:em6sci3eefw5TJHpzgTaGGuQp8UuvOmkHRsQltg0TKpMb1Lrcxicb23cQxo=,iv:VEeGmzncHyAgP5toTOwDK6qw0OT4/6Etxh8Zr4uYQD4=,tag:nvse11zMhzukzClx5ub4dw==,type:str] -ssh-private-key: ENC[AES256_GCM,data:YM8GTH6EEXLt1ZC1ZdyLWVJyGUykS0DulTL0QgOFCTztRA+5JoA6Af42MIEMm4sMSatOt9pbGE9BXh5T53uNkx87cS8pfb714N8EKrMTYmtWi2M2TatEM6+qMRpP777GalB3v2HnfTfwhx+TfQ+iSCEo45Unsumzr+/9uZ/b4vYBxbd82UKO1tmlTw3R7aEpesJuJe/I3sAg0ZXTWti0e2MYfFawlSXtgQo382bFnV/mi9JkNx62AUFI6Q0a09V2C3FU4e4qP9jeP+COfCuCjRuaf8eu0VYczy4vVkN5NNBhkuLCZl0xANfqM5tDt8q+meYHmYWq1ceyeZ9OdZhKA7lMJi2K1DgTmgbD356itEtjXb7KF7VWIVnR0Gm+vVHx90Bv6eQp4n2I5mWbCVy8wqiIlacxuH8PO6jAPUM1Q8E+SVJb2HcLPdlURHyyK0fLVWaFhtFH4rwyKAv/2yEO2iNfZd9zFqvX5/JdyUPRCpMKkjxQgZN+raVHok0SwvPfXA9wvRpQyYSD4SUqCYsRcs6JugW8a14bZrvg,iv:L9ACOUFtAxkWsXW+tDKGwKn1ZHYNv7WmBty5krayVu8=,tag:hbrgscOczukqLBU/Y+6aLA==,type:str] -nextcloud-password: ENC[AES256_GCM,data:ClQk7M7BTeIhgWTWsgjTFb0Um8qZ901530dI9xnbs63ZGIni4+bWjLPetOmM3+PPsg33vF6r0xiwu0Ff,iv:jDy8miUoPcua3sraRQWOHWrhNacKEgf6nGsi8PVTYaY=,tag:ldGta+DdUmoajtAE6HLtkw==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +14,8 @@ sops: MUZWTVh0dVdMZlRzelJ4WlROUlIyNmcKphNuMN9Wh8h/gvmtUxQWjPKtgjWriLRD +DpEEVGrmu0RJ8/wUqjxGoL4GzLAlZm4EnKlyUyA0tw8sbLZ2Lnl/w== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-01T15:48:15Z" - mac: ENC[AES256_GCM,data:64DmkqcYlLtzL+9WcgvnSOjF25MiZFkbEsgKP/xLrBBvhqqqm4ev9tk8QGoA5NJPHen+GItX7D3lJgfTyjX6LXn6vLFQWemrEP2+A9hZxnwvtdBjSD5dEl6wHGgY4mvqTJupmpv6Gg8zXP1kh5vsO82Un03TcfyPHVVgmfagpOw=,iv:j/6jJjRoiTUfTW2SJ0Ui6dAVQO9Ij8zN2mrKEhIt7fY=,tag:6r/GNnG/lw42KbWgIBoIzQ==,type:str] + lastmodified: "2024-02-22T11:58:42Z" + mac: ENC[AES256_GCM,data:TuNvE51hpHvOjB3G2y7UCT8BvlI1ulc8aeeBihtnGiGDjwU1Eze1bdA47hZYCZsCYdo3Tow1gY0gCkJACKeWqUXMLT8jxcUfiUWqQicQhBm/TT9m+oqLQiAqJCkh1Ez8XuaftqIg+oJstyy4wZyvMK8Bg+9EsSYiBnMrKfrgLBs=,iv:GXy93l1BBkkeKXJ1ntFI6Rw6QZmSbzDlWClJ16/Csv4=,tag:jBYynl6tLL/xN61ypMwvrw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.8.1 diff --git a/nixos/hosts/iso/configuration.nix b/nixos/hosts/iso/configuration.nix index 1c45890..becff32 100644 --- a/nixos/hosts/iso/configuration.nix +++ b/nixos/hosts/iso/configuration.nix @@ -2,7 +2,9 @@ inputs, outputs, lib, + config, pkgs, + nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/iso_server/configuration.nix b/nixos/hosts/iso_server/configuration.nix index 9f0cd35..a38c7d0 100644 --- a/nixos/hosts/iso_server/configuration.nix +++ b/nixos/hosts/iso_server/configuration.nix @@ -2,7 +2,9 @@ inputs, outputs, lib, + config, pkgs, + nixpkgs-stable, ... }: { imports = [ diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix index 10ff532..3495abc 100644 --- a/nixos/hosts/queen/configuration.nix +++ b/nixos/hosts/queen/configuration.nix @@ -2,7 +2,9 @@ inputs, outputs, lib, + config, pkgs, + nixpkgs-stable, ... }: { imports = [ @@ -13,8 +15,6 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - outputs.nixosModules.vpn-ip - # You can also split up your configuration and import pieces of it here: # ./nvim.nix ./hardware-configuration.nix @@ -28,17 +28,16 @@ # Import disko # ../../../disko/queen ]; + + boot.tmp.cleanOnBoot = true; zramSwap.enable = false; - services = { - openssh = { - enable = true; - settings = { - # require public key authentication for better security - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - PermitRootLogin = "no"; - }; - }; + networking.domain = ""; + services.openssh = { + enable = true; + # require public key authentication for better security + settings.PasswordAuthentication = false; + settings.KbdInteractiveAuthentication = false; + settings.PermitRootLogin = "no"; }; nixpkgs = { @@ -53,8 +52,12 @@ }; }; + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ./secrets/sops.yaml; + environment.systemPackages = with pkgs; [ fzf + matrix-conduit docker docker-compose gitea @@ -67,12 +70,13 @@ #jellyfin #jellyfin-web #jellyfin-ffmpeg + nextcloud28 nginx onlyoffice-documentserver - openssl + phanpy postgresql_16 python310 - # python310Packages.nbconvert + python310Packages.nbconvert jupyter rabbitmq-server roundcube @@ -83,71 +87,60 @@ roundcubePlugins.thunderbird_labels youtube-dl sqlite + rocksdb ]; - services.vpn-ip = { - enable = false; + + # Create an auto-update systemd service that runs every day + # system.autoUpgrade = { + # flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; + # dates = "daily"; + # enable = true; + # }; + + # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; + # Enable networking + # networking.networkmanager.enable = true; + # networking.nat.enable = true; + # networking.nat.internalInterfaces = ["ve-+"]; + # networking.nat.externalInterface = "ens18"; + networking.enableIPv6 = lib.mkForce true; + networking.nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"]; + + # networking.interfaces.ens18.ipv4.addresses = [ + # { + # address = "62.171.160.195"; + # prefixLength = 32; + # } + # ]; + + networking.interfaces.ens18.ipv6.addresses = [ + { + address = "2a02:c207:2063:2448::1"; + prefixLength = 64; + } + ]; + networking.defaultGateway6 = { + address = "fe80::1"; + interface = "ens18"; }; - networking = { - domain = ""; - - # Create an auto-update systemd service that runs every day - # system.autoUpgrade = { - # flake = "git+https://git.lillianviolet.dev/Lillian-Violet/NixOS-Config.git"; - # dates = "daily"; - # enable = true; - # }; - - # systemd.services.systemd-networkd.serviceConfig.Environment = "SYSTEMD_LOG_LEVEL=debug"; - # Enable networking - # networking.networkmanager.enable = true; - # networking.nat.enable = true; - # networking.nat.internalInterfaces = ["ve-+"]; - # networking.nat.externalInterface = "ens18"; - enableIPv6 = lib.mkForce true; - nameservers = ["2a02:c207::1:53" "2a02:c207::2:53"]; - - # networking.interfaces.ens18.ipv4.addresses = [ - # { - # address = "62.171.160.195"; - # prefixLength = 32; - # } - # ]; - - interfaces.ens18.ipv6.addresses = [ - { - address = "2a02:c207:2063:2448::1"; - prefixLength = 64; - } + # Open ports in the firewall. + networking.firewall = { + enable = true; + allowPing = false; + allowedTCPPorts = [ + 22 # SSH + 5349 # STUN tls + 5350 # STUN tls alt + 80 # http + 443 # https + ]; + allowedUDPPortRanges = [ + { + from = 49152; + to = 49999; + } # TURN relay ]; - defaultGateway6 = { - address = "fe80::1"; - interface = "ens18"; - }; - firewall = { - # Open ports in the firewall. - - enable = true; - allowPing = false; - allowedTCPPorts = [ - 22 # SSH - 5349 # STUN tls - 5350 # STUN tls alt - 80 # http - 443 # https - ]; - allowedUDPPortRanges = [ - { - from = 49152; - to = 49999; - } # TURN relay - ]; - }; - - hostName = "queen"; - - # Disable the server going through wireguard vpn for now - wireguard.enable = lib.mkForce false; }; # networking.useNetworkd = true; @@ -180,15 +173,20 @@ # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; - boot = { - tmp.cleanOnBoot = true; - loader.grub = { - enable = true; - configurationLimit = 3; + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/queen; }; - loader.efi.canTouchEfiVariables = true; }; + networking.hostName = "queen"; + + boot.loader.grub.enable = true; + boot.loader.grub.configurationLimit = 3; + boot.loader.efi.canTouchEfiVariables = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/queen/hardware-configuration.nix b/nixos/hosts/queen/hardware-configuration.nix index cf6fbc9..3357ba6 100644 --- a/nixos/hosts/queen/hardware-configuration.nix +++ b/nixos/hosts/queen/hardware-configuration.nix @@ -1,5 +1,7 @@ { + config, lib, + pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/queen/secrets/sops.yaml b/nixos/hosts/queen/secrets/sops.yaml index dcd0abb..d8c5ab7 100644 --- a/nixos/hosts/queen/secrets/sops.yaml +++ b/nixos/hosts/queen/secrets/sops.yaml @@ -6,15 +6,11 @@ releaseCookie: ENC[AES256_GCM,data:oG8DcUP+gIm5xPzIJdmjrtX/TdrcS8IgeGJeu0oOmZb0/ mssqlpass: ENC[AES256_GCM,data:XEu4bQC5qM5Cm8UDVX3qAzTuL/t3xbx+qcEbZM4h3Hg=,iv:jgpZ93THYBlUvJDC5+YZiIxu/14e7nFSy76J0vc8Hek=,tag:iKsEDp/KZ5juqzmUgtP8iA==,type:str] mailpassunhash: ENC[AES256_GCM,data:q/P3nrNLy3hCISDmalw94nzWIFhoCdCTyflj27D2Ltr8,iv:oAFna87l3sL/42ljUF1QsRL0xBrP82uYdKLxK/8HcQE=,tag:liFFGHbNPOpOHyMsjnvMOQ==,type:str] rpcSecret: ENC[AES256_GCM,data:gOuQSY2RI6rnSnG1,iv:xz1ueq4/UOKYBs5r9Tk4jL0+GyX8uo8I8ZymVgIMKLI=,tag:Fr8rWIttLz7X8Pri6FBJBQ==,type:str] -wg-private-key: ENC[AES256_GCM,data:mq8QWoQ4tE4eYaFbwCzQnRREUFI2qrnmDnwurKMu6qdKkDylqc65E7jgGDI=,iv:r5RdcmfW4OaKlbbzUCPahONvpLcfZ7X7KcEEYFIYFDk=,tag:e93C4lByJV75JMHLJ02PfA==,type:str] +wg-private: ENC[AES256_GCM,data:6BEuNqqG//p5UhRmQ4RPEze6jZdvzK4PEXxlbX2ANYIhFpacj0aZnCr9o/A=,iv:tPlwYdV4I5oA8qG+bfVi1Dpbf7xedByantqsmylZXKQ=,tag:k1BqKqlayOWz5QW1XiAjqQ==,type:str] lillian-password: ENC[AES256_GCM,data:tc+Romv2fL+tdqLLmbwqaF4IHrNZ0VEpnECmW/66FW7IUpjHMyS7YP+pmmvDCzM9afIXMxyPFHGNRwiCmxqstiiNeSeLdo6rDw==,iv:sGeu9aNTgdpThv+0Z/nZKIrat1xNgM0t/KTGPaFbsdI=,tag:kZBHF4X0KO9znog61NwU+Q==,type:str] coturn-auth-secret: ENC[AES256_GCM,data:RYxyATuYIcrGd8h8Gc4CP9ZQ80ekuuwHehnOPYisHejmycgT8a2mWpk+5r3HkFmBNcLDeNlfnhIif5oLHGuHyw==,iv:M2GdNDxP4xpP35FJPTgljbcKpOm6DmEEnIYRItAxDVI=,tag:IiiNXeTi6Yja5PrnKRkhdA==,type:str] grafana-telegraf-key: ENC[AES256_GCM,data:agpUzG1/n2NAKDt45IgelmDf0CUlC82fmD4f7JdcszNuUg7uCNA7XeaJ6PZtHQ==,iv:keo3i+qSbtXkA5fyCr2S5z9nJS9bXUn5WDiPgWocPU8=,tag:p/nDff10PRhi9pOszp1PnA==,type:str] sync-secrets: ENC[AES256_GCM,data:AwCgqfSXmYVGnCV5PJ5Ql44IiutTS76F1H7Ow7gB4mQQ8PtiAsmArzpAXd7LzsXedm55X04U+GvkcbM9cwPcF+psyb3Zi8EnI/mjnI9MgFyySSEcosJZVAtCpXGIMyYgRXtF5OBh5CzupAG059d1TDAqrSpLXMuSDdypTaOMHxnlq5q1swfpzhhY3PVgUKVFXdjZLX8aF3JTE9ceVxFsB+traLzOQsl+QKty0x0mpuqR97zkMCchX7bTwgUgbl7phzTvmwV8Qw==,iv:gkZs5NB9+CLfz4kfV4ha2llZQPP81uuXRKqUlASgpiA=,tag:DXkiG0ZFHLHlVhwLwtv/XQ==,type:str] -writefreely: ENC[AES256_GCM,data:QOj5h/rHCxmgpPNhu3IS4eyruhQokHTJxW6yQM9YDgQ=,iv:qAd+/rAAanzL9FTIX22M+2kwI0WI2d3i86cJrn8MFBo=,tag:3zvpqnovDEoJdvK/qcFDuQ==,type:str] -writefreelymysql: ENC[AES256_GCM,data:1JZwIX04O3DBAo7JvEkeNrFcSdcmk/u4WUf/kkbr2JA=,iv:8H8MR8w1iLfl2r62EbxPnLzs4qWFmwB5gNKEaly8q6c=,tag:K01oKMXkeMOFs3u7frMs0Q==,type:str] -ssh-private-key: ENC[AES256_GCM,data:DK/ggskAyhvotRkf36oZBoPw3hGvVlXneqaJZRPwX2a3YVMy4zgDE3iN65UeR6mfkp9J3OmLejOHeWFB/bRCHY3oTW6GUuZljTe2rI1/x/d2s4zX5UPPEWcy3cXH25d72DzElQBEMDKuZyDe0OZ0/NkR//vEeXgoA2Nr/NKHlTWrq/t26DMD2Vt+kQ+S9b0hh4tgh3OP1lwRu9/mTJOmInd/86gKB9+aD9V0oFvNbMEmgbwIah+ZjQBHB7GEIwjUc/lLmc+3RSn9J0rICIhnhL7NTzHUDHkYd93Tm0L9UHIyi9Oco2sK8tuV5mTDM1OK8CbDg/5FICTQ0H4sstCrDNZd2wE4E1kaZuwYOyxpzQpWJY8jOxxw5oIE0IccvvptM/9vp+0f1F2RIDrkIdHSLpFbGZGvXNVAWlXyv+0qOYS7BGzD0KAh9f74GcAvULq36vdzBahb5e+CqT3JXESne8qhkpsP0G9Z1I1Fy0xpADx/9cTnAm5RmXTw/KBPmBA5IZYZBRbR/C+N7Xyxr7u9RcwFJdIbSpAeT/ew,iv:pHT7DtX1ab7boPboXRaSg9w/4sMgNraEswtEf2tBPkw=,tag:Fbw2/Evf4ZsLFMBPflf9CA==,type:str] -mollysocket-vapid-key: ENC[AES256_GCM,data:8N2hxY6WN6mCcjMIFsw/Vt1RoGvUbYxkVPOOn4WRjXZtEEkkVCIaNevozF4xCnBUEWIukNg8lZk8ake/pHAq,iv:+NHm3hSotcRPRjrwEe9xKnEeYbnUZqJEB1sd5B+tWIE=,tag:Pd2pnJqj771XqdqBREGzJQ==,type:str] sops: kms: [] gcp_kms: [] @@ -30,8 +26,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-14T13:43:37Z" - mac: ENC[AES256_GCM,data:GK+WcmMgDbZ5xeqMK06CuquR6/ptd2oXzVJ9V74+n6lBx4XsyPu17puKGKgsGsIHeRYdbwtQh8tm42/XJ0tK8qJz1yGvfQxPasd+ibRBHatWWHzQ/czR3NIRWYqGF9/mxi2uHrftaKtku1/huxjzjb69blopMzn2LEH0vCzXCkc=,iv:K6Fbhmz9FAzLd8KcjDSriVre8MhCYrGTVXh+u6oGLaQ=,tag:4Ylrs+Mm54vAKFQyyo8Njg==,type:str] + lastmodified: "2024-04-04T16:38:10Z" + mac: ENC[AES256_GCM,data:KqkNjZe/rMhiWNS3SeYHm+b23u1LD1jq3f0+jB/BVmy6pDQDTNgA/wWHF/HcorU2Z7TOdjofJPuvRuF6C8ec4RCtTxX2ubIYWV4H3BynYxrEuEsIN8EnPJDcFFc92n9PKzoWnHo2NK1a4ZX+DxYVjDDdjhOMWj/kqWRWZRU+qEw=,iv:rarq3mCSfDFzbIdSIe+3mTNTnoZwFZ2uPkYMGt/xqos=,tag:rCD6SUpwOktRo7fM3Irv7g==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.8.1 diff --git a/nixos/hosts/shodan/auto-mount.nix b/nixos/hosts/shodan/auto-mount.nix index 2924824..664322d 100644 --- a/nixos/hosts/shodan/auto-mount.nix +++ b/nixos/hosts/shodan/auto-mount.nix @@ -1,4 +1,11 @@ -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { services.udev.extraRules = '' KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" @@ -9,7 +16,7 @@ ''; systemd.services."external-drive-mount@" = { - path = with pkgs; [util-linux udisks bash auto-mount steam jq]; + path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam]; enable = true; serviceConfig = { ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix index 44f1098..34818db 100644 --- a/nixos/hosts/shodan/configuration.nix +++ b/nixos/hosts/shodan/configuration.nix @@ -2,6 +2,7 @@ inputs, outputs, lib, + config, pkgs, ... }: { @@ -14,9 +15,8 @@ # Or modules exported from other flakes (such as nix-colors): # inputs.nix-colors.homeManagerModules.default - outputs.nixosModules.vpn-ip - # Import the shared settings + ../../shared ../../desktop/package-configs/firefox # You can also split up your configuration and import pieces of it here: @@ -27,101 +27,11 @@ # ./auto-mount.nix ]; - boot = { - tmp.cleanOnBoot = true; - loader = { - # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables - # tss group has access to TPM devices - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - systemd-boot.enable = lib.mkForce false; - systemd-boot.configurationLimit = 3; - timeout = 0; - efi.canTouchEfiVariables = true; - }; - initrd.systemd.enable = true; - - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; - consoleLogLevel = 0; - kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; - plymouth.enable = true; - }; + boot.tmp.cleanOnBoot = true; zramSwap.enable = false; - networking = { - domain = ""; - - # Enable networking - networkmanager.enable = true; - - firewall.enable = true; - - firewall.allowedTCPPorts = [22]; - - hostName = "shodan"; - }; - services.vpn-ip = { - ip = "4"; - }; - - services = { - openssh.enable = true; # Enables support for 32bit libs that steam uses - - # Enable the X11 windowing system. - xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - desktopManager.plasma6.enable = true; - - avahi = { - nssmdns4 = true; - enable = true; - ipv4 = true; - ipv6 = true; - publish = { - enable = true; - addresses = true; - workstation = true; - }; - }; - displayManager = { - defaultSession = "plasma"; - sddm.wayland.enable = lib.mkForce true; - sddm.settings = { - Autologin = { - Session = "plasma.desktop"; - User = "lillian"; - }; - }; - }; - - # Enable flatpak support - flatpak.enable = true; - packagekit.enable = true; - - # Configure keymap in X11 - xserver = { - xkb.layout = "us"; - xkb.variant = ""; - }; - - # Enable CUPS to print documents. - printing.enable = true; - - # Enable fwupd daemon and user space client - fwupd.enable = true; - # pipewire = { - # enable = true; - # alsa.enable = true; - # alsa.support32Bit = true; - # pulse.enable = true; - # }; - }; + networking.domain = ""; + services.openssh.enable = true; nixpkgs = { # You can add overlays here @@ -133,9 +43,13 @@ allowUnfree = true; }; }; + + #Set up sops config, and configure where the keyfile is, then set the mode for the unencrypted keys + sops.defaultSopsFile = ./secrets/sops.yaml; + environment.systemPackages = with pkgs; [ # Custom tools - auto-mount + # auto-mount #System: btrfs-progs @@ -145,20 +59,16 @@ noto-fonts noto-fonts-emoji-blob-bin noto-fonts-emoji - qjackctl - jellyfin-media-player - - #rustdesk + rustdesk sbctl udisks util-linux waypipe python3 - protonup-qt #KDE: krunner-translator - # kdePackages.discover + kdePackages.discover kdePackages.kcalc kdePackages.kdepim-addons kdePackages.kirigami @@ -167,39 +77,12 @@ # kdePackages.krunner-symbols kdePackages.qtvirtualkeyboard kdePackages.packagekit-qt - kdePackages.krdc - kdePackages.krfb libportal #Gaming: heroic legendary-gl - protontricks rare - lutris - - (kodi.withPackages (kodiPkgs: - with kodiPkgs; [ - steam-controller - invidious - youtube - netflix - upnext - sponsorblock - sendtokodi - jellyfin - inputstream-adaptive - inputstreamhelper - inputstream-ffmpegdirect - upnext - sponsorblock - sendtokodi - routing - requests-cache - requests - plugin-cache - a4ksubtitles - ])) ]; jovian = { @@ -217,30 +100,51 @@ devices.steamdeck = { enable = true; autoUpdate = true; - }; - steamos = { - enableAutoMountUdevRules = true; - enableMesaPatches = true; + enableGyroDsuService = true; }; }; - programs = { - steam = lib.mkForce { - enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - extest.enable = true; - }; - kdeconnect.enable = true; - noisetorch = { - enable = true; - }; + programs.steam = lib.mkForce { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + extest.enable = true; + }; + hardware.opengl.driSupport32Bit = true; # Enables support for 32bit libs that steam uses - git = { - enable = true; + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.desktopManager.plasma6.enable = true; + programs.kdeconnect.enable = true; + + services.displayManager.defaultSession = "plasma"; + services.displayManager.sddm.wayland.enable = lib.mkForce true; + services.displayManager.sddm.settings = { + Autologin = { + Session = "plasma.desktop"; + User = "lillian"; }; }; + # Enable flatpak support + services.flatpak.enable = true; + services.packagekit.enable = true; + + # Configure keymap in X11 + services.xserver = { + xkb.layout = "us"; + xkb.variant = ""; + }; + + # Enable networking + networking.networkmanager.enable = true; + + networking.firewall.enable = true; + + networking.firewall.allowedTCPPorts = [22]; + # # Enable automounting of removable media # services.udisks2.enable = true; # services.devmon.enable = true; @@ -249,30 +153,73 @@ # Set your time zone. time.timeZone = "Europe/Amsterdam"; - hardware = { - graphics.enable32Bit = true; - # Enable bluetooth hardware - bluetooth.enable = true; + # Enable CUPS to print documents. + services.printing.enable = true; - # Enable sound with pipewire. + # Enable bluetooth hardware + hardware.bluetooth.enable = true; + + # Enable fwupd daemon and user space client + services.fwupd.enable = true; + + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + + programs.noisetorch = { + enable = true; + }; + + programs.git = { + enable = true; }; - services.pulseaudio.enable = false; users.users.lillian.extraGroups = ["decky" "tss" "input"]; # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; - security = { - rtkit.enable = true; - tpm2 = { - enable = true; - pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so - tctiEnvironment.enable = true; + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/shodan; }; }; + networking.hostName = "shodan"; + + security.tpm2.enable = true; + security.tpm2.pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so + security.tpm2.tctiEnvironment.enable = true; # TPM2TOOLS_TCTI and TPM2_PKCS11_TCTI env variables + # tss group has access to TPM devices + + # Lanzaboote currently replaces the systemd-boot module. + # This setting is usually set to true in configuration.nix + # generated at installation time. So we force it to false + # for now. + boot.loader.systemd-boot.enable = lib.mkForce false; + boot.initrd.systemd.enable = true; + + boot.lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + boot.loader.systemd-boot.configurationLimit = 3; + boot.loader.timeout = 0; + boot.loader.efi.canTouchEfiVariables = true; + boot.consoleLogLevel = 0; + boot.kernelParams = ["quiet" "udev.log_priority=0" "fbcon=vc:2-6" "console=tty0"]; + boot.plymouth.enable = true; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "25.05"; + system.stateVersion = "24.11"; } diff --git a/nixos/hosts/shodan/hardware-configuration.nix b/nixos/hosts/shodan/hardware-configuration.nix index fb0baa3..fdfefac 100644 --- a/nixos/hosts/shodan/hardware-configuration.nix +++ b/nixos/hosts/shodan/hardware-configuration.nix @@ -4,6 +4,7 @@ { config, lib, + pkgs, modulesPath, ... }: { diff --git a/nixos/hosts/shodan/secrets/sops.yaml b/nixos/hosts/shodan/secrets/sops.yaml index 3c8e216..f203c8e 100644 --- a/nixos/hosts/shodan/secrets/sops.yaml +++ b/nixos/hosts/shodan/secrets/sops.yaml @@ -1,6 +1,4 @@ lillian-password: ENC[AES256_GCM,data:uPNBvMyhkiX3eedduFlsFUIcas/VBVSYrsmGTlgGUOzTQST59CYZRoq0ArphIJ3+Usy6KbR5tA5FCp4PoB3qVYBfjlAq6dhZIw==,iv:TiUIo2lvdL6SiDuW4gWn0TeJXkz5MldzqGxuK3MNPnE=,tag:d3p/h+q50JxygDtk2qxIeQ==,type:str] -wg-private-key: ENC[AES256_GCM,data:PeuKeYRHfOzGlekLI95EH3qq+blntZrrboPKaKC0ghD5zIyaCYrFHYWLkug=,iv:BcugGYW7+i7d04H4EKn+BdJJPqwMVVvlHBETO0x0kQM=,tag:Z/ammSrFpWTIbVfi4VJZ9w==,type:str] -ssh-private-key: ENC[AES256_GCM,data:7K3p6Lu4je2fNmvtKpLY2z7MG5E0gg3486PCLTlm/NzWpiH0FO8KO2yPkPPVurXfUWj7ig3eiP+bc6+kufRQ8+MCHaR+JA056cdMch0MMK92FyPvJjNKzwB4W3BpdvOKipaZvuvSfgdrEdpz6rWRwBb9KaUW5aHBjW5eQNm+q0yP2uZjW6Ncp/zrdevjlRJyXGnNJD8CBDQgLILvqlvziRO4xBnSZOmFpdCKM9jMkxwHIQUND4ic71G6cheN+kIsgsa67DlJjfrngGWxKrlC3Q2DC+30vHtW8f18oa+g7eu9eTz8+bSLxYJf9TADwE+UYe2Hakib1ju67yxBkcomIjBvqgo+zEr0jC2qYmOvlKfqn64gSbAE7zEVCbavz6gA2EMb0g47twtAdgGUyzppGQ4LXjZXv6lyYov2gdXP7bzAcXXfzDh92BuTUOp9HXOTsLh7XC7cPKziowwwT+oUeOaSujMT9tgqkazgcVR3ne+PjxduptV75gxOwxeu6F2Zm+4Y4xJBdJeyP1Baq0yj4HNY/gv3pxEEXgU5,iv:TJ3AsSvXeUmBsKd6xy+Kc1ws+Yc9ZQ5Q4A8UFHI7Wsg=,tag:egCYoe3Mkbvkup0itszm4w==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +14,8 @@ sops: KzNBMCtUaS9sU21Xc1JUd1FSR29tSkEKyqaDM/WUWjK2l+ahE6sIFYsQ6Qtkf7yz NWFTzsDZBmm9kpSIjchf+PuBuoRHeEKbEH8jnMlYB3J8boEnUnXMlw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:35:15Z" - mac: ENC[AES256_GCM,data:olqDdjgOF7MsYXibawEn4bou6LPof25j231+Vwr+pSGCO19Sj44OkZpS0YmNBi+Uym+X6RGM5uV3fg4JYVgThnALI9JFyFuZ41gjPRyNBXJ16RnogKykHK5XNjQEogYho5bgLA8DTDeOvSfFHW2ENM052z6lJyAaPWJLa4ADlEY=,iv:YXGKcHQfqZCnK9Z3Nw/JxcTmZR++0iKUc7PDbLBqahY=,tag:UbHZvFZjaYjrC51Q1f/oyg==,type:str] + lastmodified: "2024-03-19T00:42:59Z" + mac: ENC[AES256_GCM,data:WuwpvgM5WCmtsb9WH6us1dn0+qQuV/6+ooI8K7Wp+VFlMWLA4g509TgOFHG+cxWJeN2cRtilnHM1INv1U6uadjWis0LrjrqbHaMRJ5aAr3/zKoTXWTG4pRNykoYmCkwHLnx0gJi6hm4PbKOIFVM+6V5m9JCLKRVO6eqyW15SVww=,iv:xVR5ZGs2Ww+J57qreIlHSW8A+ADAOjzM7B+KLRFrRLw=,tag:6KTaeX8+Txz4j1UJUWRj+w==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.8.1 diff --git a/nixos/hosts/wheatley/armv7l.nix b/nixos/hosts/wheatley/armv7l.nix index d908a24..e6a9f37 100644 --- a/nixos/hosts/wheatley/armv7l.nix +++ b/nixos/hosts/wheatley/armv7l.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { boot.kernelPatches = [ rec { name = "compat_uts_machine"; diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index b39a571..b609001 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -1,356 +1,127 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). { - lib, - pkgs, + inputs, outputs, + lib, config, - modulesPath, + pkgs, ... }: { imports = [ - # inputs.nixos-hardware.nixosModules.raspberry-pi-4 - (modulesPath + "/installer/sd-card/sd-image-aarch64.nix") - outputs.nixosModules.vpn-ip + inputs.home-manager.nixosModules.home-manager + ./armv7l.nix ./hardware-configuration.nix - # Import shared settings + # Import shared configurations + ../../shared ]; - hardware.enableRedistributableFirmware = true; - powerManagement.cpuFreqGovernor = "ondemand"; - hardware.graphics.enable = true; + boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.configurationLimit = 5; + boot.loader.grub.enable = false; + boot.tmp.cleanOnBoot = true; - nixpkgs.overlays = [ - (final: super: { - makeModulesClosure = x: - super.makeModulesClosure (x // {allowMissing = true;}); - }) - ]; - programs = { - # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently - command-not-found.enable = lib.mkForce false; - nix-index.enable = true; - nix-index-database.comma.enable = true; - }; - services = { - automatic-timezoned.enable = true; - - # stubby = { - # enable = true; - # settings = - # pkgs.stubby.passthru.settingsExample - # // { - # upstream_recursive_servers = [ - # { - # address_data = "94.140.14.49"; - # tls_auth_name = "4b921896.d.adguard-dns.com"; - # tls_pubkey_pinset = [ - # { - # digest = "sha256"; - # value = "19HOzAWb2bgl7bo/b4Soag+5luf7bo6vlDN8W812k4U="; - # } - # ]; - # } - # { - # address_data = "94.140.14.59"; - # tls_auth_name = "4b921896.d.adguard-dns.com"; - # tls_pubkey_pinset = [ - # { - # digest = "sha256"; - # value = "19HOzAWb2bgl7bo/b4Soag+5luf7bo6vlDN8W812k4U="; - # } - # ]; - # } - # { - # address_data = "2a10:50c0:0:0:0:0:ded:ff"; - # tls_auth_name = "4b921896.d.adguard-dns.com"; - # tls_pubkey_pinset = [ - # { - # digest = "sha256"; - # value = "19HOzAWb2bgl7bo/b4Soag+5luf7bo6vlDN8W812k4U="; - # } - # ]; - # } - # { - # address_data = "2a10:50c0:0:0:0:0:dad:ff"; - # tls_auth_name = "4b921896.d.adguard-dns.com"; - # tls_pubkey_pinset = [ - # { - # digest = "sha256"; - # value = "19HOzAWb2bgl7bo/b4Soag+5luf7bo6vlDN8W812k4U="; - # } - # ]; - # } - # ]; - # }; - # }; - - openssh = { - enable = true; - # require public key authentication for better security - settings.PasswordAuthentication = false; - settings.KbdInteractiveAuthentication = false; - settings.PermitRootLogin = "no"; - }; - - davfs2.enable = true; - - aria2 = { - enable = true; - settings = { - dir = "/var/lib/media"; - rpc-listen-port = 6969; - }; - rpcSecretFile = config.sops.secrets."rpcSecret".path; - }; - dnsmasq = { - enable = true; - settings = { - interface = "wg1"; - }; - }; - }; - - sops = { - # users.users = { - # ombi.extraGroups = ["radarr" "sonarr" "aria2"]; - # }; - # services.ombi = { - # enable = true; - # port = 2368; - # }; - - # users.users = { - # radarr.extraGroups = ["aria2"]; - # sonarr.extraGroups = ["aria2"]; - # }; - - # services = { - # #uses port 7878 - # radarr.enable = true; - # #uses port 8989 - # sonarr.enable = true; - # prowlarr.enable = true; - # }; - - secrets."webdav-secret" = { - mode = "0600"; - path = "/etc/davfs2/secrets"; - owner = config.users.users.root.name; - }; - - secrets."rpcSecret".mode = "0440"; - secrets."rpcSecret".owner = config.users.users.aria2.name; - - secrets."protonvpn-priv-key".mode = "0440"; - secrets."protonvpn-priv-key".owner = config.users.users.root.name; - }; - boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages_latest; - - initrd.kernelModules = ["vc4" "bcm2835_dma" "i2c_bcm2835" "cma=256M" "console=tty0" "reset-raspberrypi"]; - kernelParams = ["video=HDMI-A-1:1920x1080@60D"]; - kernel.sysctl = { - "net.ipv4.ip_forward" = 1; - "net.ipv6.conf.all.forwarding" = 1; - }; - }; - - sdImage.compressImage = false; - - services.vpn-ip = { - enable = false; - }; - - networking = { - hostName = "wheatley"; - - networkmanager.enable = true; - - # Disable NetworkManager's internal DNS resolution - networkmanager.dns = "none"; - - # These options are unnecessary when managing DNS ourselves - useDHCP = false; - dhcpcd.enable = false; - - # Configure DNS servers manually (this example uses Cloudflare and Google DNS) - # IPv6 DNS servers can be used here as well. - nameservers = [ - # "127.0.0.1" - # "::1" - "94.140.14.49" - "94.140.14.59" - "2a10:50c0:0:0:0:0:ded:ff" - "2a10:50c0:0:0:0:0:ded:ff" + # boot.extraModulePackages = [ + # (pkgs.callPackage ./rtl8189es.nix { + # kernel = config.boot.kernelPackages.kernel; + # }) + # ]; + nixpkgs = { + # You can add overlays here + overlays = [ ]; - - wireguard.enable = true; - - wg-quick.interfaces = { - # # "wg0" is the network interface name. You can name the interface arbitrarily. - # wg0 = { - # autostart = true; - # # Determines the IP address and subnet of the server's end of the tunnel interface. - # address = ["10.2.0.2/32"]; - - # # The port that WireGuard listens to. Must be accessible by the client. - # listenPort = 51820; - - # dns = ["10.2.0.1"]; - # # Path to the private key file. - # # - # # Note: The private key can also be included inline via the privateKey option, - # # but this makes the private key world-readable; thus, using privateKeyFile is - # # recommended. - # privateKeyFile = config.sops.secrets."protonvpn-priv-key".path; - - # peers = [ - # # List of allowed peers. - # { - # # Feel free to give a meaning full name - # # Public key of the peer (not a file path). - # publicKey = "/i7jCNpcqVBUkY07gVlILN4nFdvZHmxvreAOgLGoZGg="; - # # List of IPs assigned to this peer within the tunnel subnet. Used to configure routing. - # allowedIPs = ["0.0.0.0/0"]; - # endpoint = "146.70.86.114:51820"; - # } - # ]; - # }; - - # wg public key for host: A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg= - # TODO: generate this dynamically based on other hosts - wg1 = { - # Determines the IP address and subnet of the server's end of the tunnel interface. - address = ["10.0.0.1/24" "fdc9:281f:04d7:9ee9::1/64"]; - - # The port that WireGuard listens to. Must be accessible by the client. - listenPort = 51821; - - # This allows the wireguard server to route your traffic to the internet and hence be like a VPN - postUp = '' - ${pkgs.iptables}/bin/iptables -A FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.0.0.1/24 -o eth0 -j MASQUERADE - ${pkgs.iptables}/bin/ip6tables -A FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -A POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o eth0 -j MASQUERADE - ''; - - # Undo the above - preDown = '' - ${pkgs.iptables}/bin/iptables -D FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.0.0.1/24 -o eth0 -j MASQUERADE - ${pkgs.iptables}/bin/ip6tables -D FORWARD -i wg0 -j ACCEPT - ${pkgs.iptables}/bin/ip6tables -t nat -D POSTROUTING -s fdc9:281f:04d7:9ee9::1/64 -o eth0 -j MASQUERADE - ''; - - privateKeyFile = lib.mkForce config.sops.secrets."wg-private-key".path; - - peers = [ - { - #GLaDOS public key - publicKey = "yieF2yQptaE3jStoaGytUnN+HLxyVhFBZIUOGUNAV38="; - allowedIPs = ["10.0.0.2/32" "fdc9:281f:04d7:9ee9::2/128"]; - } - { - #EDI public key - publicKey = "i4nDZbU+a2k5C20tFJRNPVE1vhYKJwhoqGHEdeC4704="; - allowedIPs = ["10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128"]; - } - { - #Shodan public key - publicKey = "Zah2nZDaHF8jpP5AtMA5bhE7t38fMB2UHzbXAc96/jw="; - allowedIPs = ["10.0.0.4/32" "fdc9:281f:04d7:9ee9::3/128"]; - } - { - #ADA public key - publicKey = "SHu7xxRVWuqp4U4uipMoITKrFPWZATGsJevUeqBSzWo="; - allowedIPs = ["10.0.0.5/32" "fdc9:281f:04d7:9ee9::3/128"]; - } - #Queen public key: FVTrYM7S2Ev2rGrYrHsG2et1/SU3UjEBQH2AOen4+04= - ]; - }; - }; - nat = { - # enable NAT - enable = true; - externalInterface = "end0"; - internalInterfaces = ["wg1"]; - }; - firewall = { - enable = true; - allowPing = false; - allowedTCPPorts = [ - 22 # SSH - 5349 # STUN tls - 5350 # STUN tls alt - 80 # http - 443 # https - 51821 # wg - 7878 - 53 # dnsmasq - ]; - allowedUDPPorts = [ - 53 #dnsmasq - ]; - allowedUDPPortRanges = [ - { - from = 51820; - to = 51822; # wg - } - { - from = 49152; - to = 49999; - } # TURN relay - ]; + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; }; }; - systemd.mounts = [ - { - enable = true; - description = "Webdav mount point"; - after = ["network-online.target"]; - wants = ["network-online.target"]; - what = "https://nextcloud.gladtherescake.eu/remote.php/dav/files/GLaDTheresCake"; - where = "/home/kodi/nextcloud"; - options = "uid=1002,gid=100,file_mode=0664,dir_mode=2775"; - type = "davfs"; - } + sops.defaultSopsFile = ./secrets/sops.yaml; + + sops.secrets."wireless.env".mode = "0440"; + sops.secrets."wireless.env".owner = config.users.users.root.name; + + environment.systemPackages = with pkgs; [ + age + git + htop ]; - environment.systemPackages = [ - pkgs.mpv-unwrapped - # (pkgs.kodi.withPackages (kodiPkgs: - # with kodiPkgs; [ - # steam-controller - # invidious - # youtube - # netflix - # upnext - # sponsorblock - # sendtokodi - # jellyfin - # inputstream-adaptive - # inputstreamhelper - # inputstream-ffmpegdirect - # upnext - # sponsorblock - # sendtokodi - # routing - # requests-cache - # requests - # plugin-cache - # a4ksubtitles - # ])) - pkgs.iptables + boot.kernelParams = [ + "console=ttyS0,115200n8" ]; - users.extraUsers.kodi.isNormalUser = true; - services.cage.user = "kodi"; - services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone"; - services.cage.enable = true; - nixpkgs.config.kodi.enableAdvancedLauncher = true; + nix = { + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; - system.stateVersion = "25.05"; - nixpkgs.hostPlatform = lib.mkForce "aarch64-linux"; + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; + }; + + networking.wireless.enable = true; + networking.wireless.environmentFile = config.sops.secrets."wireless.env".path; + networking.wireless.networks."KPNAA6306" = { + hidden = true; + auth = '' + key_mgmt=WPA-PSK + password="@PSK_HOME@" + ''; + }; + + networking.firewall.enable = true; + + networking.firewall = { + allowedTCPPorts = [22 80 443 5335 8080]; + allowedUDPPorts = [5335]; + }; + # Set your time zone. + time.timeZone = "Europe/Amsterdam"; + + programs.zsh = { + enable = true; + }; + + programs.git = { + enable = true; + }; + + home-manager = { + extraSpecialArgs = {inherit inputs outputs;}; + users = { + # Import your home-manager configuration + lillian = import ../../../home-manager/hosts/wheatley; + }; + }; + + networking.hostName = "wheatley"; # Define your hostname + + networking.wireless.interfaces = ["enu1u1"]; + + # powerManagement.cpuFreqGovernor = "powersave"; + powerManagement.cpufreq.max = 648000; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "unstable"; # Did you read the comment? } diff --git a/nixos/hosts/wheatley/hardware-configuration.nix b/nixos/hosts/wheatley/hardware-configuration.nix index 3f0b8dc..f7ea389 100644 --- a/nixos/hosts/wheatley/hardware-configuration.nix +++ b/nixos/hosts/wheatley/hardware-configuration.nix @@ -2,7 +2,9 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { + config, lib, + pkgs, modulesPath, ... }: { @@ -10,26 +12,40 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci"]; + boot.initrd.availableKernelModules = ["usbhid"]; boot.initrd.kernelModules = []; boot.kernelModules = []; boot.extraModulePackages = []; - boot.supportedFilesystems = lib.mkForce ["btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs"]; - swapDevices = [ - { - device = "/swapfile"; - size = 16 * 1024; - } - ]; + fileSystems = { + # Prior to 19.09, the boot partition was hosted on the smaller first partition + # Starting with 19.09, the /boot folder is on the main bigger partition. + # The following is to be used only with older images. Note such old images should not be considered supported anymore whatsoever, but if you installed back then, this might be needed + + # "/boot" = { + # device = "/dev/disk/by-label/FIRMWARE"; + # fsType = "vfat"; + # }; + + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; + }; + + swapDevices = [{device = "/dev/disk/by-uuid/b299ad0d-37a0-43d6-9647-5f717aca7b3";}]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.end0.useDHCP = lib.mkDefault true; + # networking.interfaces.enu1u1.useDHCP = lib.mkDefault true; + # networking.interfaces.ip6tnl0.useDHCP = lib.mkDefault true; + # networking.interfaces.sit0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; + nixpkgs.hostPlatform = lib.mkDefault "armv7l-linux"; + + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; } diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml index 6fcd84c..5594a50 100644 --- a/nixos/hosts/wheatley/secrets/sops.yaml +++ b/nixos/hosts/wheatley/secrets/sops.yaml @@ -1,10 +1,5 @@ wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str] lillian-password: ENC[AES256_GCM,data:GY7WyfLRc/q4fecnazWzfoZsruN/F0ar7mJ9RaqTHSb9K6xhEmifmJeqpR5xGIJYW6MYciCsZ9YmRsJbuSHTIlo9PrCTYBGvXg==,iv:bzml3abPox3RdvtKBQiBAcVXHUdGAn0ETMsDpBtT8T0=,tag:2iaBJ4hFFBUbonslTvQH5Q==,type:str] -protonvpn-priv-key: ENC[AES256_GCM,data:s4LAq1Rqm+jGaK3OKcjIBCQYXPs3oEuTKJMAM+gFxIpZdwcJCIU7uyoCy6c=,iv:zoWv5u0xgJHldwdRGRv3bXI1kasaWQz1YD7wt0J890I=,tag:cFXnayZRq13UqP+XWuHnWw==,type:str] -rpcSecret: ENC[AES256_GCM,data:3tCZk2csB/ofxPc6,iv:NwT6k1hh73moH6eErT23/Dvwgb1wP/qIuoxXnCgNSao=,tag:nh0mFsh9I4R1baCL1oH+AA==,type:str] -webdav-secret: ENC[AES256_GCM,data:SDFyHaE+HprkguOmDfnzwQ/n5OYgbTpxcVl4FGiLcsItefbSDOIQg5l01fqVB8zv+rRGlPcyRrIn7KTPrTpBx7X4RNHfFK4FKKvAANt6z0e5pu1+wnoObWxTShCFjfFoRCLkoh/j/CmLFyFIafrI7rzZUhs=,iv:stygLmNVWXkZL5A0J83CKPefRr7TqXeygQVLszr28eY=,tag:9hss2c77JELSASnwUyAF4w==,type:str] -wg-private-key: ENC[AES256_GCM,data:5WGAAst0qVqn1siX3snkAhsSDhZaS33XHT44BfViWLZqvzw+OhPB/jkSr4U=,iv:yXfN50SM3OWdycINB8iWXtvCSS01NBTrGBs1kxd1j0M=,tag:yhjDY1AM5aQ6DFeFEjo2Mw==,type:str] -ssh-private-key: ENC[AES256_GCM,data:zbCR/+REHSN4BIQIXSOQjSRKYWhaXutdn4AE2zxmN44qHPzMI98c7/aX2KFhHOL+vKpgyhhR6JAGVTF5Jk72lmIHwDvwvwx+gLXgpZH1KEK3nTUdwUVcqBDsVB4Na5rTsHMWmRH+NxV7n+3nSQo/Byi0Jb602IPXRNREL+0toCbHon27/o2uIy4uzbsEWZu6N2hadzQCtXmHJM2dqmbKvpADt04TQ4wAcZ6wB0538g5WdtOSU6T1xcBBSDU7MNEVP7e7dUPKJWK79cI+RrzpGIh/da7cM6exSBRas711oL6woH4Hi3G6Yjd1rPxBPt1+/qq45gm/4UvjQywn/1s7BInCe9/5vJLn3TEzuUd96CsT36vEsxMeOekXf50Ntu6Xr02bnFRwUBm76BVGAggwGf/khRNJuLw0xHsCdeKzHsPD0efe5mHTJw8mB3M6vDhO6e3g6E3uRjjBaDnrPuHuD4NE1kCjQTTJh3NbuT2Ab55lhpSOEK+f0Ik2qZgKzALvJhn+MILjXSfP/hXgiwBeP4dkTY3fOcpmnPyS,iv:ojh2hzVzJFy1kvvo/WvaIpMpGT+b9aSC+L8L0iwhF1o=,tag:bHOj/fxDn/qUmp1eijLPuw==,type:str] sops: kms: [] gcp_kms: [] @@ -20,8 +15,8 @@ sops: Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-22T22:37:02Z" - mac: ENC[AES256_GCM,data:T31z1/pngI6Wa3HMyOxS5ofb2Y5YqK0v5m96mn7n5dQ0d992ooEpoNyE7r8qHsD+tXiHvLIybWUMiMlDLI7Gq8op9GLEYYnFNDfc24k7lQPPuQK/iraJFUQwiRBbK063Rmfa6q6S3P2YN58+oxUJUiKuAy4yUIJTNaHeCCH8HMc=,iv:uLbAtSNbUcsejWdE1oBvCQVOtuaHL7A3R0sT/ispjhU=,tag:t3D7h0B0dDDZ18qo8G8wiA==,type:str] + lastmodified: "2024-02-22T11:57:45Z" + mac: ENC[AES256_GCM,data:V9vscu55woZjJGFV3aDgdHKqmIopYw6cajdOHG1/45Qel6l5YJkt8VyLMzYlUOlFGatXBlfTB7VC9zhhaY4lduww2XLrARcTk61BT+GSHp5sawND+RIDghY6CJBuoPUbtsfmmlmg+J2DljBlSbrcVmvfjMV12Ql6Zb8PEPM9K68=,iv:TFrDt1XpuIFLUyDN6+8n+0OypBkr1OrZOmXWvnY9ApI=,tag:EfsFhToEGFCZJSXh0WBrIw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.8.1 diff --git a/nixos/server/default.nix b/nixos/server/default.nix index 99a5736..75e56d1 100644 --- a/nixos/server/default.nix +++ b/nixos/server/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # You can import other home-manager modules here imports = [ ./package-configs diff --git a/nixos/server/package-configs/akkoma/default.nix b/nixos/server/package-configs/akkoma/default.nix index d0495bf..bd68ba9 100644 --- a/nixos/server/package-configs/akkoma/default.nix +++ b/nixos/server/package-configs/akkoma/default.nix @@ -1,4 +1,7 @@ { + inputs, + outputs, + lib, config, pkgs, ... diff --git a/nixos/server/package-configs/aria2/container.nix b/nixos/server/package-configs/aria2/container.nix index c76c97c..6d2fc82 100644 --- a/nixos/server/package-configs/aria2/container.nix +++ b/nixos/server/package-configs/aria2/container.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/aria2/default.nix b/nixos/server/package-configs/aria2/default.nix index e7d15bd..f2a075c 100644 --- a/nixos/server/package-configs/aria2/default.nix +++ b/nixos/server/package-configs/aria2/default.nix @@ -1,4 +1,10 @@ -{config, ...}: { +{ + inputs, + outputs, + config, + pkgs, + ... +}: { users.users.aria2.group = "aria2"; users.groups.aria2 = {}; users.users.aria2.isSystemUser = true; diff --git a/nixos/server/package-configs/caddy/default.nix b/nixos/server/package-configs/caddy/default.nix deleted file mode 100644 index 029c590..0000000 --- a/nixos/server/package-configs/caddy/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{config, ...}: { - services.phpfpm.pools.nextcloud.settings = { - "listen.owner" = config.services.caddy.user; - "listen.group" = config.services.caddy.group; - }; - - users.users.caddy.extraGroups = ["nextcloud"]; - - services.caddy = { - enable = true; - - # Setup Nextcloud virtual host to listen on ports - virtualHosts = { - "${config.services.nextcloud.hostName}" = { - useACMEHost = "${config.services.nextcloud.hostName}"; - extraConfig = '' - redir /.well-known/carddav /remote.php/dav 301 - redir /.well-known/caldav /remote.php/dav 301 - redir /.well-known/webfinger /index.php/.well-known/webfinger 301 - redir /.well-known/nodeinfo /index.php/.well-known/nodeinfo 301 - - encode gzip - reverse_proxy localhost:9000 - header Strict-Transport-Security max-age=31536000; - @forbidden { - path /.htaccess - path /data/* - path /config/* - path /db_structure - path /.xml - path /README - path /3rdparty/* - path /lib/* - path /templates/* - path /occ - path /console.php - } - handle @forbidden { - respond 404 - } - - handle { - root * /var/www/html - php_fastcgi 127.0.0.1:9000 { - # Tells nextcloud to remove /index.php from URLs in links - env front_controller_active true - } - file_server - } - ''; - }; - "onlyoffice.gladtherescake.eu" = { - }; - }; - }; -} diff --git a/nixos/server/package-configs/cinny/default.nix b/nixos/server/package-configs/cinny/default.nix index 63891b4..6079856 100644 --- a/nixos/server/package-configs/cinny/default.nix +++ b/nixos/server/package-configs/cinny/default.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + config, + pkgs, + inputs, + lib, + ... +}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix index 17424c4..1e8e631 100644 --- a/nixos/server/package-configs/conduit/default.nix +++ b/nixos/server/package-configs/conduit/default.nix @@ -1,6 +1,8 @@ { config, pkgs, + inputs, + lib, ... }: let # You'll need to edit these values @@ -29,19 +31,19 @@ ''; in { # Configure Conduit itself - services.matrix-continuwuity = { + services.matrix-conduit = { enable = true; + # This causes NixOS to use the flake defined in this repository instead of + # the build of Conduit built into nixpkgs. + package = inputs.conduwuit.packages.${pkgs.system}.default; + settings.global = { inherit server_name; + database_backend = "rocksdb"; allow_registration = false; - # emergency_password = "testpassword"; turn_uris = ["turn:turn.gladtherescake.eu.url?transport=udp" "turn:turn.gladtherescake.eu?transport=tcp"]; turn_secret = "cPKWEn4Fo5TAJoE7iX3xeVOaMVE4afeRN1iRGWYfbkWbkaZMxTpnmazHyH6c6yXT"; - well_known = { - server = "matrix.gladtherescake.eu:443"; - client = "https://matrix.gladtherescake.eu"; - }; }; }; @@ -111,7 +113,6 @@ in { locations."=/.well-known/matrix/client" = { # Use the contents of the derivation built previously alias = "${well_known_client}"; - return = "200 '{\"m.homeserver\": {\"base_url\": \"https://${server_name}\"}, \"org.matrix.msc3575.proxy\": {\"url\": \"https://${server_name}\"}}'"; extraConfig = '' # Set the header since by default NGINX thinks it's just bytes @@ -122,10 +123,9 @@ in { ''; }; locations."/_matrix/client/unstable/org.matrix.msc3575/sync" = { - proxyPass = "http://matrix.gladtherescake.eu/client/unstable/org.matrix.msc3575/sync"; + proxyPass = "http://backend_conduit/client/unstable/org.matrix.msc3575/sync"; proxyWebsockets = true; recommendedProxySettings = false; - return = "200 '{\"contacts\": [{\"matrix_id\": \"@admin:server.name\", \"email_address\": \"admin@server.name\", \"role\": \"m.role.admin\"}]}'"; extraConfig = '' proxy_set_header Host $host; proxy_buffering off; diff --git a/nixos/server/package-configs/coturn/default.nix b/nixos/server/package-configs/coturn/default.nix index 5bae63e..4539247 100644 --- a/nixos/server/package-configs/coturn/default.nix +++ b/nixos/server/package-configs/coturn/default.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { sops.secrets."coturn-auth-secret".mode = "0440"; sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; users.users.nginx.extraGroups = ["turnserver"]; diff --git a/nixos/server/package-configs/dashboard/default.nix b/nixos/server/package-configs/dashboard/default.nix index 7bbb7fc..6cb610e 100644 --- a/nixos/server/package-configs/dashboard/default.nix +++ b/nixos/server/package-configs/dashboard/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { imports = [ ./grafana #./loki diff --git a/nixos/server/package-configs/dashboard/grafana/default.nix b/nixos/server/package-configs/dashboard/grafana/default.nix index 41f696e..5589873 100644 --- a/nixos/server/package-configs/dashboard/grafana/default.nix +++ b/nixos/server/package-configs/dashboard/grafana/default.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { # grafana configuration services.grafana = { enable = true; @@ -18,13 +22,13 @@ url = "http://localhost:${toString config.services.prometheus.port}"; isDefault = true; } - { - name = "Loki"; - type = "loki"; - access = "proxy"; - url = "http://localhost:3100"; - isDefault = true; - } + # { + # name = "Loki"; + # type = "loki"; + # access = "proxy"; + # url = "http://localhost:${config.services.loki.port}"; + # isDefault = true; + # } ]; }; }; diff --git a/nixos/server/package-configs/dashboard/loki/default.nix b/nixos/server/package-configs/dashboard/loki/default.nix index e83159b..6e68716 100644 --- a/nixos/server/package-configs/dashboard/loki/default.nix +++ b/nixos/server/package-configs/dashboard/loki/default.nix @@ -1,4 +1,8 @@ -{...}: { +{ + config, + pkgs, + ... +}: { services.loki = { enable = true; configFile = ./loki.yaml; diff --git a/nixos/server/package-configs/dashboard/prometheus/default.nix b/nixos/server/package-configs/dashboard/prometheus/default.nix index fd08b3e..5ea9535 100644 --- a/nixos/server/package-configs/dashboard/prometheus/default.nix +++ b/nixos/server/package-configs/dashboard/prometheus/default.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { services.prometheus = { enable = true; port = 9001; @@ -16,19 +20,19 @@ job_name = "GrafanaService system"; static_configs = [ { - targets = ["127.0.0.1:${toString config.services.prometheus.exporters.node.port}"]; + targets = ["127.0.0.1:9002"]; } ]; } # Scrape the Loki service - { - job_name = "Loki service"; - static_configs = [ - { - targets = ["127.0.0.1:3100"]; - } - ]; - } + # { + # job_name = "Loki service"; + # static_configs = [ + # { + # targets = ["127.0.0.1:3100"]; + # } + # ]; + # } ]; }; } diff --git a/nixos/server/package-configs/dashboard/telegraf/default.nix b/nixos/server/package-configs/dashboard/telegraf/default.nix index 591e279..0c6e6ba 100644 --- a/nixos/server/package-configs/dashboard/telegraf/default.nix +++ b/nixos/server/package-configs/dashboard/telegraf/default.nix @@ -1,4 +1,11 @@ -{config, ...}: { +{ + inputs, + lib, + config, + pkgs, + user, + ... +}: { sops.secrets."grafana-telegraf-key".mode = "0440"; sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; services.telegraf = { diff --git a/nixos/server/package-configs/default.nix b/nixos/server/package-configs/default.nix index 91ff838..3d72d65 100644 --- a/nixos/server/package-configs/default.nix +++ b/nixos/server/package-configs/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { imports = [ ./conduit ./forgejo @@ -10,9 +17,7 @@ ./roundcube ./coturn ./dashboard - #./cinny - #./firefox-sync - ./writefreely - ./mollysocket + ./cinny + ./firefox-sync ]; } diff --git a/nixos/server/package-configs/forgejo/default.nix b/nixos/server/package-configs/forgejo/default.nix index b4efc44..da7b467 100644 --- a/nixos/server/package-configs/forgejo/default.nix +++ b/nixos/server/package-configs/forgejo/default.nix @@ -1,4 +1,11 @@ -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { imports = []; #sops.secrets."mailpassunhash".mode = "0440"; diff --git a/nixos/server/package-configs/gotosocial/default.nix b/nixos/server/package-configs/gotosocial/default.nix index 3740c15..9e3afdf 100644 --- a/nixos/server/package-configs/gotosocial/default.nix +++ b/nixos/server/package-configs/gotosocial/default.nix @@ -1,4 +1,11 @@ -{pkgs, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { users.users.gotosocial.extraGroups = ["virtualMail"]; services.nginx = { diff --git a/nixos/server/package-configs/jellyfin/default.nix b/nixos/server/package-configs/jellyfin/default.nix index cc492d4..f61461e 100644 --- a/nixos/server/package-configs/jellyfin/default.nix +++ b/nixos/server/package-configs/jellyfin/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; services.nginx = { diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix index eabc625..e43a5c6 100644 --- a/nixos/server/package-configs/mail-server/default.nix +++ b/nixos/server/package-configs/mail-server/default.nix @@ -1,9 +1,16 @@ -{config, ...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".owner = config.users.users.virtualMail.name; #Fix for the dovecot update - # services.dovecot2.sieve.extensions = ["fileinto"]; + services.dovecot2.sieve.extensions = ["fileinto"]; mailserver = { enable = true; @@ -14,21 +21,11 @@ "nextcloud.gladtherescake.eu" "akkoma.gladtherescake.eu" "social.gladtherescake.eu" - "gladtherescake.eu" "lillianviolet.dev" "git.lillianviolet.dev" ]; loginAccounts = { - "me@gladtherescake.eu" = { - hashedPasswordFile = config.sops.secrets."mailpass".path; - aliases = [ - "@gladtherescake.eu" - ]; - catchAll = [ - "gladtherescake.eu" - ]; - }; "no-reply@nextcloud.gladtherescake.eu" = { hashedPasswordFile = config.sops.secrets."mailpass".path; }; @@ -84,7 +81,6 @@ "no-reply@akkoma.gladtherescake.eu" "no-reply@social.gladtherescake.eu" "no-reply@git.lillianviolet.dev" - "ongebonden@gladtherescake.eu" ]; certificateScheme = "acme-nginx"; certificateDomains = [ @@ -92,7 +88,6 @@ "mail.lillianviolet.dev" "pop3.lillianviolet.dev" "lillianviolet.dev" - "gladtherescake.eu" "mail.gladtherescake.eu" ]; }; diff --git a/nixos/server/package-configs/mollysocket/default.nix b/nixos/server/package-configs/mollysocket/default.nix deleted file mode 100644 index 1d445ea..0000000 --- a/nixos/server/package-configs/mollysocket/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{config, ...}: { - sops.secrets."mollysocket-vapid-key".mode = "0440"; - - services.mollysocket = { - enable = true; - environmentFile = config.sops.secrets."mollysocket-vapid-key".path; - settings = { - port = 4381; - allowed_endpoints = ["https://molly.gladtherescake.eu" "https://nextcloud.gladtherescake.eu"]; - allowed_uuids = ["db639f29-b7e7-431a-9c75-bcdcb87b6bdf"]; - webserver = true; - }; - }; - services.nginx = { - virtualHosts = { - "molly.gladtherescake.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:4381"; - }; - }; - }; - }; -} diff --git a/nixos/server/package-configs/nextcloud/default.nix b/nixos/server/package-configs/nextcloud/default.nix index 3367dbd..483401b 100644 --- a/nixos/server/package-configs/nextcloud/default.nix +++ b/nixos/server/package-configs/nextcloud/default.nix @@ -7,14 +7,13 @@ sops.secrets."nextcloudadmin".owner = config.users.users.nextcloud.name; sops.secrets."nextclouddb".mode = "0440"; sops.secrets."nextclouddb".owner = config.users.users.nextcloud.name; - # sops.secrets."local.json".mode = "0440"; - # sops.secrets."local.json".owner = config.users.users.onlyoffice.name; + sops.secrets."local.json".mode = "0440"; + sops.secrets."local.json".owner = config.users.users.onlyoffice.name; users.users = { - # nextcloud.extraGroups = [config.users.groups.keys.name config.users.users.onlyoffice.name]; - nextcloud.extraGroups = [config.users.groups.keys.name]; + nextcloud.extraGroups = [config.users.groups.keys.name config.users.users.onlyoffice.name]; #aria2.extraGroups = ["nextcloud"]; - # onlyoffice.extraGroups = [config.users.users.nextcloud.name]; + onlyoffice.extraGroups = [config.users.users.nextcloud.name]; }; # Enable Nginx @@ -50,7 +49,7 @@ enable = true; hostName = "nextcloud.gladtherescake.eu"; - package = pkgs.nextcloud31; + package = pkgs.nextcloud29; # Use HTTPS for links https = true; @@ -91,15 +90,15 @@ }; }; - # services.onlyoffice = { - # port = 16783; - # enable = true; - # hostname = "onlyoffice.gladtherescake.eu"; - # #postgresHost = "/run/postgesql"; - # #postgresUser = "onlyoffice"; - # #postgresName = "onlyoffice"; - # #jwtSecretFile = config.sops.secrets."local.json".path; - # }; + services.onlyoffice = { + port = 16783; + enable = true; + hostname = "onlyoffice.gladtherescake.eu"; + #postgresHost = "/run/postgesql"; + #postgresUser = "onlyoffice"; + #postgresName = "onlyoffice"; + #jwtSecretFile = config.sops.secrets."local.json".path; + }; services.rabbitmq = { enable = true; diff --git a/nixos/server/package-configs/ombi/default.nix b/nixos/server/package-configs/ombi/default.nix index c82156c..7065ae5 100644 --- a/nixos/server/package-configs/ombi/default.nix +++ b/nixos/server/package-configs/ombi/default.nix @@ -1,4 +1,8 @@ -{...}: { +{ + config, + pkgs, + ... +}: { users.users = { ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; }; diff --git a/nixos/server/package-configs/phanpy/default.nix b/nixos/server/package-configs/phanpy/default.nix index 362f8f7..216412e 100644 --- a/nixos/server/package-configs/phanpy/default.nix +++ b/nixos/server/package-configs/phanpy/default.nix @@ -1,4 +1,10 @@ -{pkgs, ...}: { +{ + config, + pkgs, + inputs, + lib, + ... +}: { services.nginx = { enable = true; virtualHosts = { diff --git a/nixos/server/package-configs/postgres/default.nix b/nixos/server/package-configs/postgres/default.nix index 0a3e4f6..92b9478 100644 --- a/nixos/server/package-configs/postgres/default.nix +++ b/nixos/server/package-configs/postgres/default.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + config, + pkgs, + ... +}: { services.postgresql = { # https://nixos.org/manual/nixos/stable/#module-postgresql package = pkgs.postgresql_16; diff --git a/nixos/server/package-configs/roundcube/default.nix b/nixos/server/package-configs/roundcube/default.nix index 59ee43d..d33c621 100644 --- a/nixos/server/package-configs/roundcube/default.nix +++ b/nixos/server/package-configs/roundcube/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { # TODO: Figure out how to create packages for some plugins for roundcube! diff --git a/nixos/server/package-configs/writefreely/default.nix b/nixos/server/package-configs/writefreely/default.nix deleted file mode 100644 index 43dc7bc..0000000 --- a/nixos/server/package-configs/writefreely/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - pkgs, - ... -}: { - sops.secrets."writefreely".mode = "0440"; - sops.secrets."writefreely".owner = config.users.users.writefreely.name; - sops.secrets."writefreelymysql".mode = "0440"; - sops.secrets."writefreelymysql".owner = config.users.users.writefreely.name; - services.writefreely = { - enable = true; - host = "writefreely.gladtherescake.eu"; - nginx.enable = true; - nginx.forceSSL = true; - acme.enable = true; - # database = { - # type = "mysql"; - # createLocally = true; - # passwordFile = config.sops.secrets."writefreelymysql".path; - # }; - admin = { - initialPasswordFile = config.sops.secrets."writefreely".path; - name = "GLaDTheresCake"; - }; - settings = { - app = { - min_username_len = 2; - max_blogs = 100; - default_visibility = "public"; - federation = true; - local_timeline = true; - }; - server.port = 1212; - }; - }; - systemd.services.writefreely = { - path = [pkgs.openssl]; - }; -} diff --git a/nixos/shared/background.jpg b/nixos/shared/background.jpg deleted file mode 100644 index 2ad658c..0000000 Binary files a/nixos/shared/background.jpg and /dev/null differ diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix index 4978ed4..702add4 100644 --- a/nixos/shared/default.nix +++ b/nixos/shared/default.nix @@ -4,33 +4,15 @@ lib, config, pkgs, + pkgs-edge, ... }: { imports = [ ./locale ./packages - inputs.home-manager.nixosModules.home-manager - #../hosts/${config.networking.hostName}/hardware-configuration.nix - ]; - sops = { - age.keyFile = ../../../../../../var/secrets/keys.txt; - secrets."lillian-password".neededForUsers = true; - - defaultSopsFile = ../hosts/${config.networking.hostName}/secrets/sops.yaml; - - secrets."wg-private-key".mode = "0440"; - secrets."wg-private-key".owner = config.users.users.root.name; - - secrets."ssh-private-key" = { - mode = "0600"; - owner = config.users.users.lillian.name; - path = "/home/lillian/.ssh/id_ed25519"; - }; - }; - #TODO: remove this when unneeded for freetube - nixpkgs.config.permittedInsecurePackages = [ - "python3.12-youtube-dl-2021.12.17" ]; + sops.age.keyFile = ../../../../../../var/secrets/keys.txt; + sops.secrets."lillian-password".neededForUsers = true; nix = { package = pkgs.lix; @@ -48,184 +30,43 @@ nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; settings = { - trusted-users = ["root" "lillian"]; # Enable flakes and new 'nix' command experimental-features = "nix-command flakes"; # Deduplicate and optimize nix store auto-optimise-store = true; - extra-substituters = [ - "https://cache.lix.systems" - "https://nix-community.cachix.org" - "https://nixpkgs-unfree.cachix.org" - "https://0uptime.cachix.org" - ]; - trusted-public-keys = [ - "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" - "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" - ]; + extra-substituters = ["https://cache.lix.systems"]; + trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; }; }; - #TODO: ugly hardcoded delete, if it ever becomes a problem fix this, else just leave it I guess - system.userActivationScripts = { - removeConflictingFiles = { - text = '' - rm -f /home/lillian/.config/gtk-3.0/settings.ini.backup - rm -f /home/lillian/.config/gtk-3.0/gtk.css.backup - rm -f /home/lillian/.config/gtk-4.0/settings.ini.backup - rm -f /home/lillian/.config/gtk-4.0/gtk.css.backup - ''; - }; - }; + catppuccin.flavor = "macchiato"; + catppuccin.enable = true; - catppuccin = { - flavor = "macchiato"; - tty.enable = true; - sddm.enable = true; - sddm.flavor = "macchiato"; - forgejo.enable = true; - forgejo.flavor = "macchiato"; - # plymouth.enable = false; - # grub.enable = false; + console.catppuccin.enable = true; + + home-manager.backupFileExtension = "backup"; + + users.users.lillian = { + isNormalUser = true; + extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; + shell = pkgs.zsh; + hashedPasswordFile = config.sops.secrets."lillian-password".path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGatnsrKMoZSW24Lw4meb6BAgHgeyN/8rUib4nZVT+CB lillian@EDI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC7+LEQnC/nlYp7nQ4p6hUCqaGiqfsA3Mg8bSy+zA8Fj lillian@GLaDOS" + ]; }; programs.zsh = { enable = true; }; - programs.gnupg.agent = { - enable = true; - enableBrowserSocket = true; - }; + # Enable completion of system packages by zsh + environment.pathsToLink = ["/share/zsh"]; - stylix = { - enable = true; - # targets.qt.platform = "kde6"; - autoEnable = true; - base16Scheme = { - scheme = "Catppuccin Macchiato"; - author = "https://github.com/catppuccin/catppuccin"; - base00 = "24273a"; - base01 = "1e2030"; - base02 = "363a4f"; - base03 = "494d64"; - base04 = "5b6078"; - base05 = "cad3f5"; - base06 = "f4dbd6"; - base07 = "b7bdf8"; - base08 = "ed8796"; - base09 = "f5a97f"; - base0A = "eed49f"; - base0B = "a6da95"; - base0C = "8bd5ca"; - base0D = "8aadf4"; - base0E = "c6a0f6"; - base0F = "f0c6c6"; - }; - image = ./background.jpg; - cursor.package = pkgs.catppuccin-cursors.macchiatoMauve; - cursor.name = "catppuccin-macchiato-mauve-cursors"; - cursor.size = 24; - homeManagerIntegration.followSystem = true; - fonts = { - serif = { - package = pkgs.atkinson-hyperlegible; - name = "Atkinson Hyperlegible"; - }; + users.mutableUsers = false; - monospace = { - package = pkgs.atkinson-monolegible; - name = "Atkinson Monolegible"; - }; - - sansSerif = { - package = pkgs.atkinson-hyperlegible; - name = "Atkinson Hyperlegible"; - }; - - emoji = { - package = pkgs.noto-fonts-emoji-blob-bin; - name = "Blobmoji"; - }; - }; - }; - - fonts.packages = [ - pkgs.atkinson-hyperlegible - pkgs.atkinson-monolegible - pkgs.noto-fonts - pkgs.nerd-fonts.fira-mono - ]; - - # fonts.fontconfig.defaultFonts = { - # emoji = ["Blobmoji"]; - # monospace = ["Atkinson Monolegible"]; - # sansSerif = ["Atkinson Hyperlegible"]; - # }; - - networking = - if config.services.vpn-ip.enable - then { - wireguard.enable = true; - - wg-quick.interfaces = { - wg0 = { - autostart = true; - address = ["10.0.0.${config.services.vpn-ip.ip}/24" "fdc9:281f:04d7:9ee9::${config.services.vpn-ip.ip}/64"]; - dns = ["10.0.0.1" "fdc9:281f:04d7:9ee9::1"]; - listenPort = 51821; - privateKeyFile = config.sops.secrets."wg-private-key".path; - peers = [ - { - publicKey = "A02sO7uLdgflhPIRd0cbJONIaPP4z8HTxDkmX4NegFg="; - endpoint = "84.87.146.85:51821"; - allowedIPs = ["0.0.0.0/0" "::/0"]; - persistentKeepalive = 25; - } - ]; - }; - }; - } - else {}; - - environment = { - systemPackages = with pkgs; [ - nix-output-monitor - ]; - - # Enable completion of system packages by zsh - pathsToLink = ["/share/zsh"]; - }; - - home-manager = { - backupFileExtension = "backup"; - extraSpecialArgs = { - inputs = inputs; - outputs = outputs; - }; - users = { - # Import your home-manager configuration - lillian = import ../../home-manager/hosts/${config.networking.hostName}; - }; - }; - - users = { - users.lillian = { - isNormalUser = true; - extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"]; - shell = pkgs.zsh; - hashedPasswordFile = config.sops.secrets."lillian-password".path; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhwA+ZdP2tEBYQNdzLHZzFHxocyeqzhXI6tFpaZA3PZ lillian@EDI" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH30G2PJOnI6jnAtxOQV0SpLFUva0adarLZLvaoZvjGE lillian@GLaDOS" - ]; - }; - mutableUsers = false; - - users.root = { - hashedPassword = "*"; - }; + users.users.root = { + hashedPassword = "*"; }; } diff --git a/nixos/shared/locale/default.nix b/nixos/shared/locale/default.nix index ea9e4e8..2444204 100644 --- a/nixos/shared/locale/default.nix +++ b/nixos/shared/locale/default.nix @@ -1,4 +1,11 @@ -{...}: { +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/shared/packages/default.nix b/nixos/shared/packages/default.nix index 0d4f668..c6817e3 100644 --- a/nixos/shared/packages/default.nix +++ b/nixos/shared/packages/default.nix @@ -1,5 +1,8 @@ { + inputs, outputs, + lib, + config, pkgs, pkgs-edge, ... @@ -19,7 +22,6 @@ rebuild rebuild-no-inhibit install-nix - install-nix-no-inhibit update upgrade simple-completion-language-server @@ -30,11 +32,9 @@ e2fsprogs git git-filter-repo - pre-commit helix home-manager htop - just killall oh-my-zsh rsync @@ -50,24 +50,20 @@ # Can be used to install latest version of some packages ]); - # fonts = { - # packages = with pkgs; [ - # noto-fonts-emoji-blob-bin - # cantarell-fonts - # dejavu_fonts - # fira-code - # noto-fonts - # noto-fonts-cjk-sans - # noto-fonts-cjk-serif - # paratype-pt-sans - # paratype-pt-mono - # paratype-pt-serif - # roboto - # twemoji-color-font - # font-awesome - # atkinson-hyperlegible - # fira-code-nerdfont - # ]; - # enableDefaultPackages = false; - # }; + fonts = { + packages = with pkgs; [ + cantarell-fonts + dejavu_fonts + fira-code + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + paratype-pt-sans + paratype-pt-mono + paratype-pt-serif + roboto + twemoji-color-font + ]; + enableDefaultPackages = false; + }; } diff --git a/pkgs/auto-mount/default.nix b/pkgs/auto-mount/default.nix index b7a8a26..37a8ef2 100644 --- a/pkgs/auto-mount/default.nix +++ b/pkgs/auto-mount/default.nix @@ -1,5 +1,13 @@ { + lib, + stdenv, + system, pkgs, + jq, + coreutils, + udisks, + toybox, + util-linux, writeShellApplication, }: writeShellApplication @@ -8,7 +16,7 @@ writeShellApplication name = "auto-mount"; - runtimeInputs = [pkgs.steam]; + runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; text = '' set -euo pipefail @@ -68,7 +76,7 @@ writeShellApplication # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt - systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" + systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" else echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" fi diff --git a/pkgs/default.nix b/pkgs/default.nix index 464322b..51823f9 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,6 +12,6 @@ pkgs: { upgrade = pkgs.callPackage ./upgrade {}; restart = pkgs.callPackage ./restart {}; phanpy = pkgs.callPackage ./phanpy {}; - auto-mount = pkgs.callPackage ./auto-mount {}; + # auto-mount = pkgs.callPackage ./auto-mount {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; } diff --git a/pkgs/dvd/default.nix b/pkgs/dvd/default.nix index 0973487..7c6f81f 100644 --- a/pkgs/dvd/default.nix +++ b/pkgs/dvd/default.nix @@ -1,4 +1,6 @@ { + lib, + stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/dvt/default.nix b/pkgs/dvt/default.nix index 7a9424c..eabc160 100644 --- a/pkgs/dvt/default.nix +++ b/pkgs/dvt/default.nix @@ -1,4 +1,6 @@ { + lib, + stdenv, direnv, writeShellApplication, }: diff --git a/pkgs/fcast/default.nix b/pkgs/fcast/default.nix new file mode 100644 index 0000000..3919a72 --- /dev/null +++ b/pkgs/fcast/default.nix @@ -0,0 +1,202 @@ +{ + lib, + buildNpmPackage, + cargo, + copyDesktopItems, + dbus, + electron_28, + fetchFromGitLab, + glib, + gnome, + gtk3, + jq, + libsecret, + makeDesktopItem, + makeWrapper, + moreutils, + napi-rs-cli, + nodejs_18, + patchutils_0_4_2, + pkg-config, + python3, + runCommand, + rustc, + rustPlatform, +}: let + description = "A secure and free password manager for all of your devices"; + icon = "bitwarden"; + electron = electron_28; +in + buildNpmPackage rec { + pname = "bitwarden-desktop"; + version = "2024.3.0"; + + src = fetchFromGitLab { + owner = "videostreaming"; + repo = "fcast"; + rev = "b13d0f7e8150c279d377a78f89d338b7fc0f5539"; + hash = "sha256-XEZB95GnfSy/wtTWpF8KlUQwyephUZmSLtbOwbcvd7g="; + }; + + patches = [ + ./electron-builder-package-lock.patch + ]; + + # The nested package-lock.json from upstream is out-of-date, so copy the + # lock metadata from the root package-lock.json. + postPatch = '' + cat {,apps/desktop/src/}package-lock.json \ + | ${lib.getExe jq} -s ' + .[1].packages."".dependencies.argon2 = .[0].packages."".dependencies.argon2 + | .[0].packages."" = .[1].packages."" + | .[1].packages = .[0].packages + | .[1] + ' \ + | ${moreutils}/bin/sponge apps/desktop/src/package-lock.json + ''; + + nodejs = nodejs_18; + + makeCacheWritable = true; + npmFlags = ["--legacy-peer-deps"]; + npmWorkspace = "apps/desktop"; + npmDepsHash = "sha256-EpZXA+GkmHl5eqwIPTGHJZqrpr6k8gXneJG+GXumlkc="; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + patches = + map + ( + patch: + runCommand + (builtins.baseNameOf patch) + {nativeBuildInputs = [patchutils_0_4_2];} + '' + < ${patch} filterdiff -p1 --include=${lib.escapeShellArg cargoRoot}'/*' > $out + '' + ) + patches; + patchFlags = ["-p4"]; + sourceRoot = "${src.name}/${cargoRoot}"; + hash = "sha256-qAqEFlUzT28fw6kLB8d7U8yXWevAU+q03zjN2xWsGyI="; + }; + cargoRoot = "apps/desktop/desktop_native"; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + nativeBuildInputs = [ + cargo + copyDesktopItems + jq + makeWrapper + moreutils + napi-rs-cli + pkg-config + python3 + rustc + rustPlatform.cargoCheckHook + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + glib + gtk3 + libsecret + ]; + + preBuild = '' + if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then + echo 'ERROR: electron version mismatch' + exit 1 + fi + ''; + + postBuild = '' + pushd apps/desktop + + # desktop_native/index.js loads a file of that name regarldess of the libc being used + mv desktop_native/desktop_native.* desktop_native/desktop_native.linux-x64-musl.node + + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron}/libexec/electron \ + -c.electronVersion=${electron.version} + + popd + ''; + + doCheck = true; + + nativeCheckInputs = [ + dbus + (gnome.gnome-keyring.override {useWrappedDaemon = false;}) + ]; + + checkFlags = [ + "--skip=password::password::tests::test" + ]; + + checkPhase = '' + runHook preCheck + + pushd ${cargoRoot} + export HOME=$(mktemp -d) + export -f cargoCheckHook runHook _eval _callImplicitHook + export cargoCheckType=release + dbus-run-session \ + --config-file=${dbus}/share/dbus-1/session.conf \ + -- bash -e -c cargoCheckHook + popd + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + + pushd apps/desktop/dist/linux-unpacked + mkdir -p $out/opt/Bitwarden + cp -r locales resources{,.pak} $out/opt/Bitwarden + popd + + makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \ + --add-flags $out/opt/Bitwarden/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + pushd apps/desktop/resources/icons + for icon in *.png; do + dir=$out/share/icons/hicolor/"''${icon%.png}"/apps + mkdir -p "$dir" + cp "$icon" "$dir"/${icon}.png + done + popd + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "bitwarden"; + exec = "bitwarden %U"; + inherit icon; + comment = description; + desktopName = "Bitwarden"; + categories = ["Utility"]; + }) + ]; + + meta = { + changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}"; + inherit description; + homepage = "https://bitwarden.com"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [amarshall kiwi]; + platforms = ["x86_64-linux"]; + mainProgram = "bitwarden"; + }; + } diff --git a/pkgs/install-nix-no-inhibit/default.nix b/pkgs/install-nix-no-inhibit/default.nix index a1dff9e..f9365fe 100644 --- a/pkgs/install-nix-no-inhibit/default.nix +++ b/pkgs/install-nix-no-inhibit/default.nix @@ -1,6 +1,7 @@ { + lib, + stdenv, git, - nix-output-monitor, gum, writeShellApplication, }: @@ -8,7 +9,7 @@ writeShellApplication { name = "install-nix-no-inhibit"; - runtimeInputs = [git gum nix-output-monitor]; + runtimeInputs = [git gum]; text = '' # An install script for NixOS installation to /tmp @@ -37,8 +38,8 @@ writeShellApplication --mode zap_create_mount \ "./disko/''${dir}/default.nix" echo "NixOS Installing..." - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json - sudo nixos-install --flake .#"''${dir}" --show-trace --log-format internal-json -v |& nom --json + sudo nixos-install --flake .#"''${dir}" + sudo nixos-install --flake .#"''${dir}" popd > /dev/null echo "Cleaning up repository in '/tmp/install-nix'..." rm -rf ./install-nix diff --git a/pkgs/install-nix/default.nix b/pkgs/install-nix/default.nix index 51bd530..bfcf17e 100644 --- a/pkgs/install-nix/default.nix +++ b/pkgs/install-nix/default.nix @@ -1,4 +1,8 @@ -{writeShellApplication}: +{ + lib, + stdenv, + writeShellApplication, +}: writeShellApplication { name = "install-nix"; diff --git a/pkgs/rebuild-no-inhibit/default.nix b/pkgs/rebuild-no-inhibit/default.nix index ab38581..4503fcc 100644 --- a/pkgs/rebuild-no-inhibit/default.nix +++ b/pkgs/rebuild-no-inhibit/default.nix @@ -1,13 +1,13 @@ { + lib, + stdenv, writeShellApplication, - nix-output-monitor, - just, }: writeShellApplication { name = "rebuild-no-inhibit"; - runtimeInputs = [nix-output-monitor just]; + runtimeInputs = []; text = '' # A rebuild script for NixOS @@ -18,7 +18,7 @@ writeShellApplication git clone https://codeberg.org/Lillian-Violet/NixOS-Config.git ./rebuild pushd ./rebuild > /dev/null echo "NixOS Rebuilding..." - just build + sudo nixos-rebuild switch --flake .# popd > /dev/null echo "Cleaning up repository in '/tmp/rebuild'..." rm -rf ./rebuild diff --git a/pkgs/rebuild/default.nix b/pkgs/rebuild/default.nix index 8c61e66..8b59258 100644 --- a/pkgs/rebuild/default.nix +++ b/pkgs/rebuild/default.nix @@ -1,4 +1,8 @@ -{writeShellApplication}: +{ + lib, + stdenv, + writeShellApplication, +}: writeShellApplication { name = "rebuild"; diff --git a/pkgs/restart/default.nix b/pkgs/restart/default.nix index 2405faa..c3fe9c1 100644 --- a/pkgs/restart/default.nix +++ b/pkgs/restart/default.nix @@ -1,4 +1,8 @@ -{writeShellApplication}: +{ + lib, + stdenv, + writeShellApplication, +}: writeShellApplication { name = "restart"; diff --git a/pkgs/simple-completion-language-server/default.nix b/pkgs/simple-completion-language-server/default.nix index 474f9f3..00d16a2 100644 --- a/pkgs/simple-completion-language-server/default.nix +++ b/pkgs/simple-completion-language-server/default.nix @@ -5,17 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "simple-completion-language-server"; - version = "6c797949ad5a6e9548b60b5475d1c9977f26c811"; + version = "ff9f90bc96c347f284571bc6310bc31f95508d55"; src = fetchFromGitHub { owner = "estin"; repo = pname; rev = version; - hash = "sha256-cITZdlDB03i7gOYbahV99wZOQ7tisnqdT/N2Z12oLFM="; + hash = "sha256-qybbZXjKzKcc6UXfAjwmkkB+qEUuGQXABRbMj7bNksM="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-nannF4BKRLCcsS7VznzEHqrhLHYvN4X22t8jud87XEM="; + cargoHash = "sha256-VTz2Fm+PRUPM5+u9D+2TzGGIEQwb1j0Lz0WRaQ5/Yzo="; meta = with lib; { description = "Language server to enable word completion and snippets for Helix editor"; homepage = "https://github.com/estin/simple-completion-language-server"; diff --git a/pkgs/simple-completion-language-server/result b/pkgs/simple-completion-language-server/result new file mode 120000 index 0000000..5a7c687 --- /dev/null +++ b/pkgs/simple-completion-language-server/result @@ -0,0 +1 @@ +/nix/store/3l0wgxsvf5sz2q9sgyj0blc1ivzg808b-simple-completion-language-server-ff9f90bc96c347f284571bc6310bc31f95508d55 \ No newline at end of file diff --git a/pkgs/update/default.nix b/pkgs/update/default.nix index 7f1b3e4..a965b8c 100644 --- a/pkgs/update/default.nix +++ b/pkgs/update/default.nix @@ -1,4 +1,8 @@ -{writeShellApplication}: +{ + lib, + stdenv, + writeShellApplication, +}: writeShellApplication { name = "update"; diff --git a/pkgs/upgrade/default.nix b/pkgs/upgrade/default.nix index 7ab662b..d72c480 100644 --- a/pkgs/upgrade/default.nix +++ b/pkgs/upgrade/default.nix @@ -1,4 +1,8 @@ -{writeShellApplication}: +{ + lib, + stdenv, + writeShellApplication, +}: writeShellApplication { name = "upgrade";