From b3cb8940d443b7818ef0699cb0e56f8be55946e9 Mon Sep 17 00:00:00 2001 From: ISnortPennies Date: Sat, 4 Feb 2023 14:49:48 -0500 Subject: [PATCH] renamed configuration.nix to common.nix moved sudo configuration to shells.nix switched to kmscon reorganized all packages removed a few switched from scripts to shell aliases set keep-outputs and keep-derivations to false removed picom from laptop --- configuration.nix => common.nix | 11 ------ flake.lock | 28 ++++------------ flake.nix | 8 ++--- modules/fonts.nix | 26 +++++++++++++++ modules/packages.nix | 44 +++++++++--------------- modules/scripts.nix | 41 ----------------------- modules/shells.nix | 59 ++++++++++++++++++++++++++++++--- modules/sxhkd.nix | 7 +++- nix.nix | 4 +++ systems/desktop.nix | 4 ++- systems/laptop.nix | 2 -- 11 files changed, 119 insertions(+), 115 deletions(-) rename configuration.nix => common.nix (85%) delete mode 100644 modules/scripts.nix diff --git a/configuration.nix b/common.nix similarity index 85% rename from configuration.nix rename to common.nix index 717b59e..92e22b7 100644 --- a/configuration.nix +++ b/common.nix @@ -5,13 +5,6 @@ ... }: { system.stateVersion = settings.version; - security.sudo = { - enable = true; - execWheelOnly = true; - extraConfig = '' - Defaults env_keep += "EDITOR VISUAL PAGER SYSTEMD_PAGERSECURE TERMINAL" - ''; - }; #hardware stuff hardware = { enableRedistributableFirmware = true; @@ -77,10 +70,6 @@ }; #terminal stuff i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - useXkbConfig = true; - }; programs.dconf.enable = true; services.gvfs.enable = true; #gvfs for pcmanfm } diff --git a/flake.lock b/flake.lock index fcbc5d0..aabfeb1 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675362331, - "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=", + "lastModified": 1675454231, + "narHash": "sha256-5rgcWq1nFWlbR3NsLqY7i/7358uhkSeMQJ/LEHk3BWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a100acd7bbf105915b0004427802286c37738fef", + "rev": "06999209d7a0043d4372e38f57cffae00223d592", "type": "github" }, "original": { @@ -88,21 +88,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1675485332, - "narHash": "sha256-fFxXsBC+0wpxVzcUMDFsghG+oWrsf5/yCzusfDcRhqg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce310d1e4a614d7d0b24c9cc1ef172214a637d37", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, "nvim-config": { "inputs": { "flake-utils": "flake-utils_2", @@ -111,11 +96,11 @@ ] }, "locked": { - "lastModified": 1675126675, - "narHash": "sha256-AJPwC5uqycc75hMrHpB8AzhzHcTDX9ESOmasJp12reU=", + "lastModified": 1675536108, + "narHash": "sha256-HjWJ7HF77U32QLsRWZGrrZXW3lnq7iYPZ6as+Je5dwQ=", "owner": "ISnortPennies", "repo": "nvim-config", - "rev": "e97deb8ff0901607069aa9df840fdd831058810f", + "rev": "cda439a36bf6677fe4c8ebddf7e59e2df2742059", "type": "github" }, "original": { @@ -129,7 +114,6 @@ "fetch-rs": "fetch-rs", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", "nvim-config": "nvim-config", "spicetify-nix": "spicetify-nix", "suckless": "suckless", diff --git a/flake.nix b/flake.nix index 2e2cfe1..5274aa9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; - nixpkgs-master.url = github:NixOS/nixpkgs; home-manager = { url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; @@ -42,9 +41,9 @@ t-rex-miner = final.callPackage ./pkgs/t-rex-miner {}; afk-cmds = final.callPackage ./pkgs/afk-cmds {}; parrot = final.callPackage ./pkgs/parrot {}; - webcord = inputs.nixpkgs-master.legacyPackages.${system}.webcord; }) inputs.suckless.overlay + inputs.nvim-config.overlays.${system}.default inputs.fetch-rs.overlays.${system}.default ]; }; @@ -65,7 +64,7 @@ inputs.sxhkd-flake.nixosModules.sxhkd inputs.home-manager.nixosModules.home-manager ./home-manager - ./configuration.nix + ./common.nix ./systems/desktop.nix ./nix.nix ]; @@ -81,10 +80,9 @@ }; }; modules = [ - inputs.sxhkd-flake.nixosModules.sxhkd inputs.home-manager.nixosModules.home-manager ./home-manager - ./configuration.nix + ./common.nix ./systems/laptop.nix ./nix.nix ]; diff --git a/modules/fonts.nix b/modules/fonts.nix index 62ba12d..debdb7c 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,4 +1,29 @@ {pkgs, ...}: { + services.kmscon = { + enable = true; + hwRender = true; + extraConfig = '' + font-size=12 + ''; + fonts = [ + { + name = "Overpass Mono"; + package = pkgs.overpass; + } + { + name = "OverpassMono Nerd Font"; + package = + pkgs.nerdfonts.override + { + fonts = ["Overpass"]; + }; + } + { + name = "Material Design Icons"; + package = pkgs.material-design-icons; + } + ]; + }; fonts = { fonts = with pkgs; [ overpass @@ -8,6 +33,7 @@ fonts = ["Overpass"]; }) ]; + enableDefaultFonts = false; fontDir.enable = true; fontconfig = { enable = true; diff --git a/modules/packages.nix b/modules/packages.nix index a3b2b73..a45d97e 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,40 +1,28 @@ -{ - config, - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { environment = { defaultPackages = []; #don't install anything by default systemPackages = with pkgs; [ - bottom #view tasks efibootmgr #efi editor - maim #screenshooter pciutils #lspci alsa-utils #volume control - btrfs-progs #for external harddrive - vlc #play stuff - webcord # talk to people (gross) - feh #for wallpaper - xfce.mousepad - brightnessctl #brightness control for laptop - playerctl #music control - networkmanagerapplet #gui connection control - pavucontrol #gui volume control xclip #commandline clipboard access - exa #ls replacement - cava #pretty audio - nitch # cus yes - dmenu #suckless launcher - st #suckless terminal - pipes-rs # more fun things - pcmanfm #file manager - nix-tree #view packages + btrfs-progs #for external harddrive + feh #for wallpaper + + #directly used tui apps + bottom #view tasks bc #terminal calculator - page #use nvim as a pager + nix-tree #view packages + #pointless stuff + cava #pretty audio + pipes-rs # more fun things + + #gui apps + pavucontrol #gui volume control + pcmanfm #file manager + #big gui apps + webcord # talk to people (gross) librewolf #best browser - inputs.nvim-config.packages.${pkgs.system}.default #my custom nvim flake - fetch-rs ]; }; } diff --git a/modules/scripts.nix b/modules/scripts.nix deleted file mode 100644 index c2236a4..0000000 --- a/modules/scripts.nix +++ /dev/null @@ -1,41 +0,0 @@ -{pkgs, ...}: let - update-system = pkgs.writeShellScriptBin "update-system" '' - if ! [ $(id -u) = 0 ]; then - echo "RUN AS ROOT" - exit 1 - fi - nix flake update /etc/nixos/# - ''; - - clean-store = pkgs.writeShellScriptBin "clean-store" '' - if ! [ $(id -u) = 0 ]; then - echo "RUN AS ROOT" - exit 1 - fi - rm /nix/var/nix/gcroots/auto/* - nix-collect-garbage -d - ''; - - apply-system = pkgs.writeShellScriptBin "apply-system" '' - if ! [ $(id -u) = 0 ]; then - echo "RUN AS ROOT" - exit 1 - fi - nixos-rebuild switch --flake /etc/nixos/# - ''; - - full-upgrade = pkgs.writeShellScriptBin "full-upgrade" '' - if ! [ $(id -u) = 0 ]; then - echo "RUN AS ROOT" - exit 1 - fi - update-system - apply-system - ''; - - pastebin = pkgs.writeShellScriptBin "pastebin" '' - curl -F 'clbin=<-' https://clbin.com - ''; -in { - environment.systemPackages = [update-system apply-system full-upgrade clean-store pastebin]; -} diff --git a/modules/shells.nix b/modules/shells.nix index 55f682d..2327294 100644 --- a/modules/shells.nix +++ b/modules/shells.nix @@ -1,18 +1,68 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: rec { environment = { + systemPackages = with pkgs; [ + dash + neovim + page + zsh + st + exa + fetch-rs + ]; binsh = "${pkgs.dash}/bin/dash"; #use dash for speed variables = { - EDITOR = "vi"; - VISUAL = "vi"; + EDITOR = "nvim"; + VISUAL = "nvim"; PAGER = "page"; SYSTEMD_PAGERSECURE = "true"; TERMINAL = "st"; + NIX_BUILD_SHELL = "zsh"; }; shellAliases = { - ls = "exa --long --icons"; + vm-start = "virsh start Windows"; + vm-stop = "virsh shutdown Windows"; + #make sudo use aliases + sudo = "sudo "; + #paste link trick + pastebin = "curl -F 'clbin=<-' https://clbin.com"; + #nix stuff + update = "nix flake update /etc/nixos/#"; + switch = "nixos-rebuild switch"; + boot = "nixos-rebuild boot"; + clean = "nix-collect-garbage -d"; + gc-force = "rm /nix/var/gcroots/auto/*"; + gc-check = "find -H /nix/var/nix/gcroots/auto -type l | xargs -I {} sh -c 'readlink {}; realpath {}; echo' | page"; + #vim stuff + vi = "nvim"; + vim = "nvim"; + vimdiff = "nvim -d"; + #exa is 1 too many letters + ls = "exa"; + l = "exa -lbF --git"; + ll = "$exa -lbGF --git"; + llm = "exa -lbGd --git --sort=modified"; + la = "exa -lbhHigUmuSa --time-style=long-iso --git --color-scale"; + lx = "exa -lbhHigUmuSa@ --time-style=long-iso --git --color-scale"; + lS = "exa -1"; + lt = "exa --tree --level=2"; }; interactiveShellInit = "fetch-rs"; }; + security.sudo = { + enable = true; + execWheelOnly = true; + extraConfig = '' + Defaults env_keep += "${builtins.concatStringsSep " " (builtins.attrNames environment.variables)}" + ''; + }; + + #zsh stuff + users.defaultUserShell = pkgs.zsh; + environment.shells = [pkgs.zsh]; programs = { zsh = { enable = true; @@ -23,6 +73,7 @@ enable = true; }; }; + #starship starship = { enable = true; settings = { diff --git a/modules/sxhkd.nix b/modules/sxhkd.nix index aceb075..32c3d89 100644 --- a/modules/sxhkd.nix +++ b/modules/sxhkd.nix @@ -1,4 +1,9 @@ -{ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + maim #screenshooter + brightnessctl #brightness control for laptop + playerctl #music control + ]; services.sxhkd = { enable = true; keybindings = { diff --git a/nix.nix b/nix.nix index 28eb5a2..3b3bf96 100644 --- a/nix.nix +++ b/nix.nix @@ -36,5 +36,9 @@ auto-optimise-store = true; warn-dirty = false; }; + extraOptions = '' + keep-outputs = false + keep-derivations = false + ''; }; } diff --git a/systems/desktop.nix b/systems/desktop.nix index 9a70280..7745db1 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -14,7 +14,6 @@ "parrot" "picom" "refreshrate" - "scripts" "sxhkd" "vfio" "dwm" @@ -28,6 +27,9 @@ environment.systemPackages = with pkgs; [ bitwarden #store stuff qbittorrent #steal stuff + networkmanagerapplet #gui connection control + vlc #play stuff + dmenu #suckless launcher ]; networking.hostName = settings.hostname; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/systems/laptop.nix b/systems/laptop.nix index 68e6ddb..c2d4a36 100644 --- a/systems/laptop.nix +++ b/systems/laptop.nix @@ -10,9 +10,7 @@ "fonts" "git" "packages" - "picom" "prime" - "scripts" "gnome" "shells" "gaming"