Compare commits
No commits in common. "bb2f9b96dd3e38203f8eaf9dd6e5e833ca217bdb" and "96cd2ed76f9b86fdb691f723abd7d8c80b83afbc" have entirely different histories.
bb2f9b96dd
...
96cd2ed76f
92
flake.lock
92
flake.lock
|
@ -46,26 +46,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"duralumin": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"rust-overlays": "rust-overlays",
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1756908377,
|
|
||||||
"narHash": "sha256-TriFYm3nafLeSBd5RXTD98w0WIF2xi6PlrAfmLlsfr0=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "a6b7dae4d878f8a36e65f3e2242af961f85b2bb7",
|
|
||||||
"revCount": 17,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.nirgendwo.xyz/janis/duralumin.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.nirgendwo.xyz/janis/duralumin.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -177,38 +157,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1756787288,
|
|
||||||
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1744536153,
|
|
||||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756754095,
|
"lastModified": 1756754095,
|
||||||
"narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
|
"narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=",
|
||||||
|
@ -224,7 +172,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756542300,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
|
@ -243,7 +191,7 @@
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756856604,
|
"lastModified": 1756856604,
|
||||||
|
@ -275,32 +223,13 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"apple-fonts": "apple-fonts",
|
"apple-fonts": "apple-fonts",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"duralumin": "duralumin",
|
|
||||||
"emacs-overlay": "emacs-overlay",
|
"emacs-overlay": "emacs-overlay",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur"
|
"nur": "nur"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlays": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1756866691,
|
|
||||||
"narHash": "sha256-YWJsM0HfdFLcaoP5OeyzjX6MjGnJ0Acm+bg1QN8MKjo=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "fb6dab6f320291a8edd31c1d67f078c6f7384a02",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sf-arabic": {
|
"sf-arabic": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -384,21 +313,6 @@
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
|
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
62
flake.nix
62
flake.nix
|
@ -16,10 +16,9 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
|
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
|
||||||
duralumin.url = "git+https://git.nirgendwo.xyz/janis/duralumin.git";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ { self, disko, nixpkgs, nixpkgs-unstable, home-manager, duralumin, emacs-overlay, ... }:
|
outputs = inputs @ { self, disko, nixpkgs, nixpkgs-unstable, home-manager, apple-fonts, emacs-overlay, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
overlay-unstable = final: prev: {
|
overlay-unstable = final: prev: {
|
||||||
|
@ -33,38 +32,37 @@
|
||||||
mkSystem = {host, ...}: nixpkgs.lib.nixosSystem {
|
mkSystem = {host, ...}: nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
./configuration.nix
|
./configuration.nix
|
||||||
./options.nix
|
./options.nix
|
||||||
./pkgs
|
./pkgs
|
||||||
host
|
host
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
disko.nixosModules.disko
|
disko.nixosModules.disko
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true; # Use global packages in home-manager
|
home-manager.useGlobalPkgs = true; # Use global packages in home-manager
|
||||||
home-manager.useUserPackages = true; # Use user packages in home-manager
|
home-manager.useUserPackages = true; # Use user packages in home-manager
|
||||||
|
|
||||||
home-manager.extraSpecialArgs = {
|
home-manager.extraSpecialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
];
|
|
||||||
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs home-manager;
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
|
||||||
config.allowUnfree = true; # Allow unfree packages globally
|
|
||||||
|
|
||||||
overlays = [
|
|
||||||
inputs.nur.overlays.default
|
|
||||||
emacs-overlay.overlays.default
|
|
||||||
overlay-unstable
|
|
||||||
duralumin.overlays.default
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs home-manager;
|
||||||
|
};
|
||||||
|
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
config.allowUnfree = true; # Allow unfree packages globally
|
||||||
|
|
||||||
|
overlays = [
|
||||||
|
inputs.nur.overlays.default
|
||||||
|
emacs-overlay.overlays.default
|
||||||
|
overlay-unstable
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -91,8 +91,6 @@ in {
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
# Add your global packages here
|
# Add your global packages here
|
||||||
duralumin
|
|
||||||
duralumin-keygen
|
|
||||||
neovim
|
neovim
|
||||||
bottom
|
bottom
|
||||||
git
|
git
|
||||||
|
|
|
@ -45,9 +45,6 @@ in{
|
||||||
"new-tab-button"
|
"new-tab-button"
|
||||||
];
|
];
|
||||||
|
|
||||||
"browser.uiCustomization.state" = ''
|
|
||||||
{"placements":{"widget-overflow-fixed-list":[],"unified-extensions-area":["_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"],"nav-bar":["sidebar-button","firefox-view-button","alltabs-button","back-button","forward-button","stop-reload-button","urlbar-container","vertical-spacer","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","unified-extensions-button"],"toolbar-menubar":["menubar-items"],"TabsToolbar":[],"vertical-tabs":["tabbrowser-tabs"],"PersonalToolbar":["import-button","personal-bookmarks"]},"seen":["developer-button","screenshot-button","_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action","ublock0_raymondhill_net-browser-action","_04188724-64d3-497b-a4fd-7caffe6eab29_-browser-action"],"dirtyAreaCache":["nav-bar","TabsToolbar","vertical-tabs","PersonalToolbar","unified-extensions-area","toolbar-menubar"],"currentVersion":23,"newElementCount":0}'';
|
|
||||||
|
|
||||||
# hardening
|
# hardening
|
||||||
"browser.newtabpage.enabled" = true;
|
"browser.newtabpage.enabled" = true;
|
||||||
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
"browser.newtabpage.activity-stream.feeds.telemetry" = false;
|
||||||
|
|
|
@ -1,73 +1,6 @@
|
||||||
{pkgs, lib, super-config, ...}: {
|
{pkgs, lib, super-config, ...}: {
|
||||||
services.hyprpolkitagent.enable = true;
|
services.hyprpolkitagent.enable = true;
|
||||||
programs.hyprlock = {
|
programs.hyprlock.enable = true;
|
||||||
enable = true;
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
background = {
|
|
||||||
monitor = "";
|
|
||||||
path = "~/.local/share/wallpapers/current_lock";
|
|
||||||
blur_passes = 2;
|
|
||||||
contrast = 1;
|
|
||||||
brightness = 0.5;
|
|
||||||
vibrancy = 0.2;
|
|
||||||
vibrancy_darkness = 0.2;
|
|
||||||
};
|
|
||||||
|
|
||||||
general = {
|
|
||||||
no_fade_in = true;
|
|
||||||
no_fade_out = true;
|
|
||||||
hide_cursor = false;
|
|
||||||
grace = 2;
|
|
||||||
enable_fingerprint = true;
|
|
||||||
disable_loading_bar = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
input-field = {
|
|
||||||
monitor = "";
|
|
||||||
size = "250, 60";
|
|
||||||
outline_thickness = 2;
|
|
||||||
dots_size = 0.2;
|
|
||||||
dots_spacing = 0.35;
|
|
||||||
dots_center = true;
|
|
||||||
outer_color = "rgba(0, 0, 0, 0)";
|
|
||||||
inner_color = "rgba(0, 0, 0, 0.2)";
|
|
||||||
font_color = "$foreground";
|
|
||||||
fade_on_empty = false;
|
|
||||||
rounding = -1;
|
|
||||||
check_color = "rgb(204, 136, 34)";
|
|
||||||
placeholder_text = "<i><span foreground=\"##cdd6f4\">Input Password...</span></i>";
|
|
||||||
hide_input = false;
|
|
||||||
position = "0, -200";
|
|
||||||
halign = "center";
|
|
||||||
valign = "center";
|
|
||||||
};
|
|
||||||
|
|
||||||
# DATE
|
|
||||||
label-date = {
|
|
||||||
monitor = "";
|
|
||||||
text = ''cmd[update:1000] echo "''$(${pkgs.coreutils}/bin/date +"%A, %B %d")"'';
|
|
||||||
color = "rgba(242, 243, 244, 0.75)";
|
|
||||||
font_size = 22;
|
|
||||||
font_family = "JetBrains Mono";
|
|
||||||
position = "0, 300";
|
|
||||||
halign = "center";
|
|
||||||
valign = "center";
|
|
||||||
};
|
|
||||||
|
|
||||||
# TIME
|
|
||||||
label-time = {
|
|
||||||
monitor = "";
|
|
||||||
text = ''cmd[update:1000] echo "''$(${pkgs.coreutils} +"%-I:%M")"'';
|
|
||||||
color = "rgba(242, 243, 244, 0.75)";
|
|
||||||
font_size = 95;
|
|
||||||
font_family = "JetBrains Mono Extrabold";
|
|
||||||
position = "0, 200";
|
|
||||||
halign = "center";
|
|
||||||
valign = "center";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.hypridle = lib.optionals (super-config.enableHypridle == true) {
|
services.hypridle = lib.optionals (super-config.enableHypridle == true) {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -104,7 +37,6 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
hyprlock
|
hyprlock
|
||||||
coreutils
|
|
||||||
] ++ (lib.optionals (super-config.enableHypridle == true) [
|
] ++ (lib.optionals (super-config.enableHypridle == true) [
|
||||||
hypridle
|
hypridle
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -302,7 +302,7 @@ in {
|
||||||
background: rgba(40, 40, 40, 0.3);
|
background: rgba(40, 40, 40, 0.3);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
font-family: SF Compact Rounded;
|
font-family: SF Compact Rounded;
|
||||||
font-size: 11pt;
|
font-size: 12pt;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
''
|
''
|
||||||
|
|
|
@ -49,10 +49,6 @@
|
||||||
mountpoint = "/var/games";
|
mountpoint = "/var/games";
|
||||||
mountOptions = ["subvol=@games" "compress=zstd" "noatime"];
|
mountOptions = ["subvol=@games" "compress=zstd" "noatime"];
|
||||||
};
|
};
|
||||||
"@code" = {
|
|
||||||
mountpoint = "/var/code";
|
|
||||||
mountOptions = ["subvol=@code" "compress=zstd" "noatime"];
|
|
||||||
};
|
|
||||||
"@nix" = {
|
"@nix" = {
|
||||||
mountpoint = "/nix";
|
mountpoint = "/nix";
|
||||||
mountOptions = ["subvol=@nix" "compress=zstd" "noatime"];
|
mountOptions = ["subvol=@nix" "compress=zstd" "noatime"];
|
||||||
|
|
Loading…
Reference in a new issue