summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2026-01-26 08:06:19 -0500
committerFreya Murphy <freya@freyacat.org>2026-01-26 08:06:19 -0500
commit351d76d05ac4cd67866fa2005ee4501a2b14e6a7 (patch)
tree8a6cce571bdb88792645fb78c487ab4888864d0e
parentmodify firefox stuff (diff)
downloaddotfiles-nix-351d76d05ac4cd67866fa2005ee4501a2b14e6a7.tar.gz
dotfiles-nix-351d76d05ac4cd67866fa2005ee4501a2b14e6a7.tar.bz2
dotfiles-nix-351d76d05ac4cd67866fa2005ee4501a2b14e6a7.zip
update commits and remove unused modules/inputs
Diffstat (limited to '')
-rw-r--r--flake.lock254
-rw-r--r--flake.nix18
-rw-r--r--home/browsers/default.nix1
-rw-r--r--home/browsers/zen.nix32
-rw-r--r--home/desktops/hyprland/default.nix5
-rw-r--r--home/neovim/default.nix2
-rw-r--r--hosts/shinji/default.nix1
-rw-r--r--lib/default.nix1
-rw-r--r--options.nix4
-rw-r--r--system/default.nix1
-rw-r--r--system/desktop.nix10
-rw-r--r--system/hardened.nix58
12 files changed, 26 insertions, 361 deletions
diff --git a/flake.lock b/flake.lock
index 6a8003c..35e5ece 100644
--- a/flake.lock
+++ b/flake.lock
@@ -111,9 +111,7 @@
"nixpkgs": [
"nixpkgs"
],
- "quickshell": [
- "quickshell"
- ]
+ "quickshell": "quickshell"
},
"locked": {
"lastModified": 1769179160,
@@ -146,20 +144,6 @@
}
},
"flake-compat_2": {
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "revCount": 69,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
- }
- },
- "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1767039857,
@@ -175,24 +159,6 @@
"type": "github"
}
},
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
- "lastModified": 1754487366,
- "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems_2"
@@ -211,24 +177,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_4"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -258,11 +206,11 @@
]
},
"locked": {
- "lastModified": 1769132734,
- "narHash": "sha256-gmU9cRplrQWqoback9PgQX7Dlsdx8JlhlVZwf0q1F7E=",
+ "lastModified": 1769397130,
+ "narHash": "sha256-TTM4KV9IHwa181X7afBRbhLJIrgynpDjAXJFMUOWfyU=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d055b309a6277343cb1033a11d7500f0a0f669fc",
+ "rev": "c37679d37bdbecf11bbe3c5eb238d89ca4f60641",
"type": "github"
},
"original": {
@@ -646,35 +594,13 @@
"type": "github"
}
},
- "nix-mineral": {
- "inputs": {
- "flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1768781397,
- "narHash": "sha256-8vQDgKzTlLGI7PlJShUf2c+BAL3VXeZtHvecj0vFXzM=",
- "owner": "cynicsketch",
- "repo": "nix-mineral",
- "rev": "bbab6680f6895c9534db4549d618cb06f16a1914",
- "type": "github"
- },
- "original": {
- "owner": "cynicsketch",
- "repo": "nix-mineral",
- "type": "github"
- }
- },
"nixos-hardware": {
"locked": {
- "lastModified": 1769086393,
- "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
+ "lastModified": 1769302137,
+ "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
+ "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
"type": "github"
},
"original": {
@@ -686,17 +612,17 @@
},
"nixos-wsl": {
"inputs": {
- "flake-compat": "flake-compat_3",
+ "flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
- "lastModified": 1768840529,
- "narHash": "sha256-e22ou8nikeThx9x9/y29VdMEW4Fm7DBzlhp9ndDJUGE=",
+ "lastModified": 1769217863,
+ "narHash": "sha256-RY9kJDXD6+2Td/59LkZ0PFSereCXHdBX9wIkbYjRKCY=",
"owner": "nix-community",
"repo": "nixos-wsl",
- "rev": "b8e9a758fa2e08d8ac5c3be5d4b1fcc92fd3ce84",
+ "rev": "38a5250e57f583662eac3b944830e4b9e169e965",
"type": "github"
},
"original": {
@@ -707,11 +633,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1769018530,
- "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+ "lastModified": 1769170682,
+ "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+ "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
"type": "github"
},
"original": {
@@ -721,21 +647,6 @@
"type": "github"
}
},
- "nixpkgs-lib": {
- "locked": {
- "lastModified": 1753579242,
- "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "nixpkgs.lib",
- "type": "github"
- }
- },
"ny": {
"flake": false,
"locked": {
@@ -771,30 +682,10 @@
"type": "github"
}
},
- "preload-ng": {
- "inputs": {
- "flake-utils": "flake-utils",
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1768356181,
- "narHash": "sha256-lYx273nqNC1EslejL/yvf+ZJK+yApeUckibbpTyzxoM=",
- "owner": "miguel-b-p",
- "repo": "preload-ng",
- "rev": "b2274bfa70f86c649ba4bddd5fd21c82ffccebe3",
- "type": "github"
- },
- "original": {
- "owner": "miguel-b-p",
- "repo": "preload-ng",
- "type": "github"
- }
- },
"quickshell": {
"inputs": {
"nixpkgs": [
+ "caelestia-shell",
"nixpkgs"
]
},
@@ -805,11 +696,11 @@
"rev": "191085a8821b35680bba16ce5411fc9dbe912237",
"revCount": 731,
"type": "git",
- "url": "https://git.outfoxxed.me/quickshell/quickshell"
+ "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
"original": {
"type": "git",
- "url": "https://git.outfoxxed.me/quickshell/quickshell"
+ "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}
},
"root": {
@@ -821,41 +712,11 @@
"hy3": "hy3",
"hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
- "nix-mineral": "nix-mineral",
"nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs",
- "preload-ng": "preload-ng",
- "quickshell": "quickshell",
- "rose-pine-hyprcursor": "rose-pine-hyprcursor",
"sops-nix": "sops-nix",
- "talc": "talc",
- "zen-browser": "zen-browser"
- }
- },
- "rose-pine-hyprcursor": {
- "inputs": {
- "hyprlang": [
- "hyprland",
- "hyprlang"
- ],
- "nixpkgs": [
- "nixpkgs"
- ],
- "utils": "utils"
- },
- "locked": {
- "lastModified": 1748096947,
- "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=",
- "owner": "ndom91",
- "repo": "rose-pine-hyprcursor",
- "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1",
- "type": "github"
- },
- "original": {
- "owner": "ndom91",
- "repo": "rose-pine-hyprcursor",
- "type": "github"
+ "talc": "talc"
}
},
"sf-arabic": {
@@ -949,11 +810,11 @@
]
},
"locked": {
- "lastModified": 1768863606,
- "narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=",
+ "lastModified": 1769314333,
+ "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2",
+ "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f",
"type": "github"
},
"original": {
@@ -992,39 +853,9 @@
"type": "github"
}
},
- "systems_3": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_4": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"talc": {
"inputs": {
- "flake-utils": "flake-utils_2",
+ "flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
@@ -1043,24 +874,6 @@
"url": "https://g.trimill.xyz/talc"
}
},
- "utils": {
- "inputs": {
- "systems": "systems_3"
- },
- "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"
- }
- },
"xdph": {
"inputs": {
"hyprland-protocols": [
@@ -1101,29 +914,6 @@
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
- },
- "zen-browser": {
- "inputs": {
- "home-manager": [
- "home-manager"
- ],
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1769059766,
- "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=",
- "owner": "0xc000022070",
- "repo": "zen-browser-flake",
- "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6",
- "type": "github"
- },
- "original": {
- "owner": "0xc000022070",
- "repo": "zen-browser-flake",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 08a90da..137e8c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,29 +31,11 @@
# nixos-wsl
nixos-wsl.url = "github:nix-community/nixos-wsl";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
- # rose-pine-hyprcursor
- rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
- rose-pine-hyprcursor.inputs.nixpkgs.follows = "nixpkgs";
- rose-pine-hyprcursor.inputs.hyprlang.follows = "hyprland/hyprlang";
- # zen browser
- zen-browser.url = "github:0xc000022070/zen-browser-flake";
- zen-browser.inputs.nixpkgs.follows = "nixpkgs";
- zen-browser.inputs.home-manager.follows = "home-manager";
- # preload-ng
- preload-ng.url = "github:miguel-b-p/preload-ng";
- preload-ng.inputs.nixpkgs.follows = "nixpkgs";
# nixos-hardware
nixos-hardware.url = "github:nixos/nixos-hardware/master";
- # nix-mineral
- nix-mineral.url = "github:cynicsketch/nix-mineral";
- nix-mineral.inputs.nixpkgs.follows = "nixpkgs";
- # quickshell
- quickshell.url = "git+https://git.outfoxxed.me/quickshell/quickshell";
- quickshell.inputs.nixpkgs.follows = "nixpkgs";
# caelestia-shell
caelestia-shell.url = "git+https://g.freya.cat/caelestia-shell";
caelestia-shell.inputs.nixpkgs.follows = "nixpkgs";
- caelestia-shell.inputs.quickshell.follows = "quickshell";
};
outputs = {
diff --git a/home/browsers/default.nix b/home/browsers/default.nix
index e4a65e1..5f1b9dc 100644
--- a/home/browsers/default.nix
+++ b/home/browsers/default.nix
@@ -1,6 +1,5 @@
_: {
imports = [
./firefox
- ./zen.nix
];
}
diff --git a/home/browsers/zen.nix b/home/browsers/zen.nix
deleted file mode 100644
index 5ead8c7..0000000
--- a/home/browsers/zen.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- config,
- lib,
- inputs,
- ...
-}: let
- inherit (lib) mkIf;
- cfg = config.browsers.zen;
-in {
- imports = [
- inputs.zen-browser.homeModules.default
- ];
-
- config = mkIf cfg.enable {
- default.browser = lib.mkDefault "zen";
-
- programs.zen-browser = {
- enable = true;
-
- # import configuration
- policies = import ./firefox/policies.nix;
-
- # create profile for me :3
- profiles.${config.user} = {
- search = {
- force = true;
- default = "ddg";
- };
- };
- };
- };
-}
diff --git a/home/desktops/hyprland/default.nix b/home/desktops/hyprland/default.nix
index acb1529..913ca57 100644
--- a/home/desktops/hyprland/default.nix
+++ b/home/desktops/hyprland/default.nix
@@ -3,6 +3,7 @@
config,
lib,
system,
+ pkgs,
...
}: let
inherit (lib) mkIf;
@@ -18,8 +19,8 @@ in {
];
config = mkIf cfg.enable {
- home.packages = [
- inputs.rose-pine-hyprcursor.packages.${system}.default
+ home.packages = with pkgs; [
+ rose-pine-hyprcursor
];
wayland.windowManager.hyprland = {
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index e120113..1eb18d8 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -14,7 +14,7 @@ in {
viAlias = true;
vimAlias = true;
- extraLuaConfig = ''
+ initLua = ''
local config = ${lua_cfg}
${lua}
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 4062082..311d10b 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -103,5 +103,4 @@
bluetooth = true;
network = true;
tpm = true;
- hardened = false;
}
diff --git a/lib/default.nix b/lib/default.nix
index 0e882dd..7fa783b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -20,7 +20,6 @@ in {
fingerprint
network
tpm
- hardened
minimal
# Primary User
user
diff --git a/options.nix b/options.nix
index 241f726..3eb8b80 100644
--- a/options.nix
+++ b/options.nix
@@ -297,9 +297,6 @@ in {
tpm = mkEnableOption {
description = "Enable system TPM";
};
- hardened = mkEnableOption {
- description = "Hardened the NixOS system";
- };
minimal = mkEnableOption {
description = "Install only required system services, drivers, and programs.";
};
@@ -493,7 +490,6 @@ in {
#
browsers = {
firefox.enable = mkEnableOption "Enable the firefox browser.";
- zen.enable = mkEnableOption "Enable the zen browser.";
};
#
diff --git a/system/default.nix b/system/default.nix
index 9be2937..aba8c11 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -15,7 +15,6 @@
./bluetooth.nix
./desktop.nix
./fingerprint.nix
- ./hardened.nix
./hardware.nix
./networking.nix
./sshd.nix
diff --git a/system/desktop.nix b/system/desktop.nix
index 8a37148..853296b 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -8,10 +8,6 @@
}: let
inherit (lib) mkIf;
in {
- imports = [
- inputs.preload-ng.nixosModules.default
- ];
-
config = mkIf config.desktops.enable {
# nix-ld
programs.nix-ld.enable = true;
@@ -61,12 +57,6 @@ in {
};
users.groups.lp.members = [config.user];
- # preload-ng
- services.preload-ng = {
- enable = true;
- package = inputs.preload-ng.packages.${system}.preload-ng-src;
- };
-
# secrets
services.gnome.gnome-keyring.enable = true;
diff --git a/system/hardened.nix b/system/hardened.nix
deleted file mode 100644
index 223b358..0000000
--- a/system/hardened.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- lib,
- config,
- inputs,
- ...
-}: let
- inherit (lib) mkIf;
-in {
- imports = [
- inputs.nix-mineral.nixosModules.nix-mineral
- ];
-
- config = mkIf config.hardened {
- nix-mineral = {
- enable = true;
- settings = {
- debug = {
- coredump = true;
- zram = false;
- };
- network = {
- icmp = {
- cast = true;
- ignore-all = false;
- };
- };
- kernel = {
- cpu-mitigations = "smt-on";
- io-uring = true;
- lockdown = true;
- only-signed-modules = true;
- pti = true;
- sysrq = "none";
- };
- system = {
- yama = "relaxed";
- };
- };
- extras = {
- kernel = {
- intelme-kmodules = false;
- };
- system = {
- secure-chrony = true;
- unprivileged-userns = false;
- };
- };
- filesystems = {
- normal = {
- # let me run shell scripts
- # please and thank you
- "/home".options.noexec = lib.mkForce false;
- "/etc".options.noexec = lib.mkForce true;
- };
- };
- };
- };
-}