Compare commits
No commits in common. "660149f46b5996576387821bcc944f5a7634d87c" and "8d596d5ed42c1f6ed91952f0fb877acb492a9a82" have entirely different histories.
660149f46b
...
8d596d5ed4
20 changed files with 129 additions and 125 deletions
125
flake.lock
generated
125
flake.lock
generated
|
|
@ -10,11 +10,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747575206,
|
||||
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
|
||||
"lastModified": 1745630506,
|
||||
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
||||
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -72,11 +72,11 @@
|
|||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746562888,
|
||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||
"lastModified": 1745523430,
|
||||
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -220,11 +220,11 @@
|
|||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747677437,
|
||||
"narHash": "sha256-c3oiw6RysUVxRqkv39gxhiO1WjfvuEzZw4PemN0C7Kk=",
|
||||
"lastModified": 1744642301,
|
||||
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "6b2061ac6faf5dfb52d5b41dca98fa0c022b2b91",
|
||||
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -338,6 +338,7 @@
|
|||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"stylix",
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -392,6 +393,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"stylix",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -459,16 +481,16 @@
|
|||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744584021,
|
||||
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
||||
"lastModified": 1732369855,
|
||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "GNOME",
|
||||
"ref": "48.1",
|
||||
"ref": "47.2",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -529,11 +551,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747565775,
|
||||
"narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
|
||||
"lastModified": 1746369725,
|
||||
"narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
|
||||
"rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -550,11 +572,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747279714,
|
||||
"narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
|
||||
"lastModified": 1746369725,
|
||||
"narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
|
||||
"rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -563,26 +585,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nh": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747943020,
|
||||
"narHash": "sha256-LlMUdltEdGxVLDZRSDQn3/i/WWn7Jakdz4wQxLxzfZ8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nh",
|
||||
"rev": "24c12228e1f1e4fc953e37283fe442ca169951ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nh",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1731533336,
|
||||
|
|
@ -687,11 +689,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1747542820,
|
||||
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
|
||||
"lastModified": 1746328495,
|
||||
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
|
||||
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -703,11 +705,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1747327360,
|
||||
"narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
|
||||
"lastModified": 1745930157,
|
||||
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
|
||||
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -719,10 +721,7 @@
|
|||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"stylix",
|
||||
"flake-parts"
|
||||
],
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
|
|
@ -751,11 +750,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747647098,
|
||||
"narHash": "sha256-q97sL76AwyTbykQPNB/iHuxhUtR5MslJQdKPYIM9pXQ=",
|
||||
"lastModified": 1746393339,
|
||||
"narHash": "sha256-7PXmCQfExrIOh8ISeruCWnmi3C1h/QjzfWyLA8FRRm8=",
|
||||
"owner": "wamserma",
|
||||
"repo": "flake-programs-sqlite",
|
||||
"rev": "687ecefe4c7aa963d6e591e39045bcdfa3d2f7ae",
|
||||
"rev": "d61db790e37ccdb961510746bbfdf615fd085c99",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -788,7 +787,6 @@
|
|||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"grapevine": "grapevine",
|
||||
"home-manager": "home-manager_2",
|
||||
"nh": "nh",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"programsdb": "programsdb",
|
||||
"stylix": "stylix",
|
||||
|
|
@ -820,7 +818,7 @@
|
|||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme_2",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"git-hooks": "git-hooks",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_3",
|
||||
|
|
@ -834,11 +832,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747675820,
|
||||
"narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=",
|
||||
"lastModified": 1746395987,
|
||||
"narHash": "sha256-Na6MAPSWIWzxsgxwcxLhQ160ExvyyhCdC1JDcBA8vW8=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70",
|
||||
"rev": "70f331c8e7da588e07e70cef15a114f9fcec3cee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -927,16 +925,17 @@
|
|||
"tinted-kitty": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1735730497,
|
||||
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
|
||||
"lastModified": 1716423189,
|
||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -1032,11 +1031,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747562021,
|
||||
"narHash": "sha256-XfF+5zjoWbAcAiGNb++og6yDGJRwWYpADr9P6WuieQA=",
|
||||
"lastModified": 1744611115,
|
||||
"narHash": "sha256-7WsdYgA6bh9dytXdLKQYUkUdSux6fNo7SZXYqMJx72k=",
|
||||
"owner": "viperML",
|
||||
"repo": "wrapper-manager",
|
||||
"rev": "f2b0bec5140403cf24cae96f6764d97b5d59b0e2",
|
||||
"rev": "a4990b7da8e7845974031599e7f6104226cfb43e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@
|
|||
url = "github:viperML/wrapper-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nh = {
|
||||
url = "github:nix-community/nh";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs: let
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {environment.shellAliases.cat = "${lib.getExe pkgs.bat} --theme Nord";}
|
||||
|
|
@ -1 +1 @@
|
|||
{nix.settings.experimental-features = ["nix-command" "flakes" "repl-flake"];}
|
||||
{nix.settings.experimental-features = ["nix-command" "flakes"];}
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {environment.shellAliases.ls = "${lib.getExe pkgs.eza} --all --icons --hyperlink --group-directories-first --color=always";}
|
||||
|
|
@ -7,6 +7,30 @@
|
|||
'';
|
||||
};
|
||||
|
||||
environment.shells = [pkgs.fish];
|
||||
environment = {
|
||||
shells = [pkgs.fish];
|
||||
shellAliases = {
|
||||
# Utility
|
||||
ls = "eza";
|
||||
cat = "bat";
|
||||
rm = "gio trash";
|
||||
free = "free -h";
|
||||
neofetch = "neowofetch";
|
||||
shutdown = "shutdown now";
|
||||
|
||||
# Git
|
||||
clone = "gh repo clone";
|
||||
create = "gh repo create";
|
||||
|
||||
push = "git push";
|
||||
commit = "git commit -am";
|
||||
|
||||
# NixOS
|
||||
clean = "nh clean all";
|
||||
rebuild = "nh os switch";
|
||||
rebuildServer = "nixos-rebuild switch --flake ~/.config/nixos#quadraticserver --target-host quadradical@192.168.0.132 --use-remote-sudo";
|
||||
update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
|
||||
};
|
||||
};
|
||||
users.defaultUserShell = pkgs.fish;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{pkgs, ...}: {environment.shellAliases.free = "${pkgs.procps}/bin/free -h";}
|
||||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
{pkgs, ...}: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
config = {
|
||||
|
|
@ -21,17 +17,5 @@
|
|||
gpg.format = "ssh";
|
||||
};
|
||||
};
|
||||
environment = {
|
||||
systemPackages = [pkgs.gh];
|
||||
shellAliases = let
|
||||
gitExe = lib.meta.getExe pkgs.git;
|
||||
ghExe = lib.meta.getExe pkgs.gh;
|
||||
in {
|
||||
clone = "${ghExe} repo clone";
|
||||
create = "${ghExe} repo create";
|
||||
|
||||
push = "${gitExe} push";
|
||||
commit = "${gitExe} commit -am";
|
||||
};
|
||||
};
|
||||
environment.systemPackages = [pkgs.gh];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.shellAliases.neofetch = "${pkgs.hyfetch}/bin/neowofetch --config ${./neofetch.conf}";
|
||||
}
|
||||
|
|
@ -1,23 +1,7 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
pkg = inputs.nh.packages.${pkgs.system}.default;
|
||||
exe = lib.getExe pkg;
|
||||
in {
|
||||
programs.nh = {
|
||||
enable = true;
|
||||
package = pkg;
|
||||
clean.enable = true;
|
||||
flake = "/home/quadradical/.config/nixos";
|
||||
};
|
||||
|
||||
environment.shellAliases = {
|
||||
clean = "${exe} clean all";
|
||||
update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
|
||||
rebuild = "${exe} os switch";
|
||||
rebuildServer = "${exe} os switch --hostname quadraticserver --target-host 192.168.0.132";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
# environment.systemPackages = [(pkgs.writeShellScriptBin "sudo" "run0 $@")];
|
||||
# security = {
|
||||
# sudo.enable = false;
|
||||
# pam.services.systemd-run0 = {};
|
||||
# };
|
||||
environment.systemPackages = [(pkgs.writeShellScriptBin "sudo" "run0 $@")];
|
||||
security = {
|
||||
sudo.enable = false;
|
||||
pam.services.systemd-run0 = {};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{pkgs, ...}: {environment.shellAliases.rm = "${pkgs.glib}/bin/gio trash";}
|
||||
|
|
@ -85,6 +85,7 @@
|
|||
"compiz-windows-effect@hermes83.github.com"
|
||||
"user-theme@gnome-shell-extensions.gcampax.github.com"
|
||||
"display-brightness-ddcutil@themightydeity.github.com"
|
||||
"system-monitor@gnome-shell-extensions.gcampax.github.com"
|
||||
"launch-new-instance@gnome-shell-extensions.gcampax.github.com"
|
||||
];
|
||||
disabled-extensions = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
just-perfection
|
||||
burn-my-windows
|
||||
fullscreen-avoider
|
||||
launch-new-instance
|
||||
compiz-windows-effect
|
||||
rounded-window-corners-reborn
|
||||
brightness-control-using-ddcutil
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
tuba
|
||||
gimp
|
||||
deno
|
||||
dart
|
||||
ptyxis
|
||||
heroic
|
||||
aspell
|
||||
|
|
@ -14,10 +15,14 @@
|
|||
r2modman
|
||||
pciutils
|
||||
resources
|
||||
alejandra
|
||||
impression
|
||||
libreoffice
|
||||
wl-clipboard
|
||||
protontricks
|
||||
prismlauncher
|
||||
authenticator
|
||||
android-studio
|
||||
nexusmods-app-unfree
|
||||
hunspellDicts.en_CA-large
|
||||
];
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
"nix.serverPath" = lib.meta.getExe pkgs.nil;
|
||||
"nix.serverSettings" = {
|
||||
"nil" = {
|
||||
"formatting" = {"command" = [(lib.getExe pkgs.alejandra)];};
|
||||
"formatting" = {"command" = ["alejandra"];};
|
||||
};
|
||||
};
|
||||
"indentRainbow.ignoreErrorLanguages" = ["*"];
|
||||
|
|
|
|||
6
wrappers/common/bat.nix
Normal file
6
wrappers/common/bat.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
wrappers.bat = {
|
||||
basePackage = pkgs.bat;
|
||||
flags = ["--theme" "Nord"];
|
||||
};
|
||||
}
|
||||
12
wrappers/common/eza.nix
Normal file
12
wrappers/common/eza.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{pkgs, ...}: {
|
||||
wrappers.eza = {
|
||||
basePackage = pkgs.eza;
|
||||
flags = [
|
||||
"--all"
|
||||
"--icons"
|
||||
"--hyperlink"
|
||||
"--color=always"
|
||||
"--group-directories-first"
|
||||
];
|
||||
};
|
||||
}
|
||||
9
wrappers/common/neofetch/default.nix
Normal file
9
wrappers/common/neofetch/default.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
{pkgs, ...}: {
|
||||
wrappers.neofetch = {
|
||||
basePackage = pkgs.hyfetch; # Neowofetch
|
||||
flags = [
|
||||
"--config"
|
||||
./neofetch.conf
|
||||
];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue