From 3ae23987708a731a083113082194ff4a1aabebdf Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Fri, 27 Oct 2023 11:37:03 -0400 Subject: [PATCH] Cool stuff --- common.nix | 4 +- flake.lock | 188 +++++++++++++++++++++++++++------- flake.nix | 8 +- home-manager/bat.nix | 2 +- home-manager/firefox.nix | 9 +- quadraticpc/configuration.nix | 19 ++-- quadraticpc/stylix.nix | 2 + 7 files changed, 176 insertions(+), 56 deletions(-) diff --git a/common.nix b/common.nix index 81c19c8..86bf71d 100755 --- a/common.nix +++ b/common.nix @@ -29,7 +29,7 @@ shellAliases = { # Utility cat = "bat"; - rm = "rmtrash"; + rm = "gio trash"; free = "free -h"; ping = "prettyping"; shutdown = "shutdown now"; @@ -42,6 +42,7 @@ commit = "git add -A && git commit -am"; # NixOS + dev = "nix develop"; garbage = "sudo nix-collect-garbage -d"; flake = "$EDITOR ~/.config/nixos/flake.nix"; common = "$EDITOR ~/.config/nixos/common.nix"; @@ -54,7 +55,6 @@ systemPackages = with pkgs; [ micro - rmtrash prettyping ]; }; diff --git a/flake.lock b/flake.lock index 546a03a..e1515c8 100755 --- a/flake.lock +++ b/flake.lock @@ -18,14 +18,126 @@ "type": "github" } }, + "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1674275109, + "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-kitty": { + "flake": false, + "locked": { + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", + "repo": "base16-vim", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1696121307, - "narHash": "sha256-jmYHoZYx2/dSvDH/khg7vi2qaKKuXK1g8pnvcRyLw/4=", + "lastModified": 1698329218, + "narHash": "sha256-OU6LyGeePS31pG7o10su7twDzDL5Z3a1sHtV68SzEwI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "ecac4b99d490e57af2c0d5ffa89b5923ca838a35", + "rev": "3cb70833903a560ac22f49d278e7ce955bf8395e", "type": "github" }, "original": { @@ -55,11 +167,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -91,11 +203,11 @@ ] }, "locked": { - "lastModified": 1696409884, - "narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=", + "lastModified": 1698392685, + "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05", + "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", "type": "github" }, "original": { @@ -133,11 +245,11 @@ ] }, "locked": { - "lastModified": 1696332552, - "narHash": "sha256-chsT/zHLDn1+gOACWtQmZrSWlVPTuNBYCSa9uZkQsvE=", + "lastModified": 1698368990, + "narHash": "sha256-V5dLZN6GXpRiFPhtfCRqaKIdRwHH9RkH7ZX4efUwCRs=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "cd66002bb827370c9076cadda5584b7ed15f7480", + "rev": "e5a21c813a4ea3f16da04939bf5b6b0b6697855b", "type": "github" }, "original": { @@ -148,11 +260,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -165,11 +277,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -180,19 +292,18 @@ "type": "github" } }, - "nixpkgs-master": { + "nixpkgs-local": { "locked": { - "lastModified": 1696429540, - "narHash": "sha256-5E1T5OQkImk3hsZ9D7xpGbEGt/8bD8ciZyYS9/laPz4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "91782588964678a13e7aa4b90910964d9db56314", - "type": "github" + "dirtyRev": "7ab567df5f57a3a069c1da688c15d9db9f09f78a-dirty", + "dirtyShortRev": "7ab567df5f5-dirty", + "lastModified": 1698245796, + "narHash": "sha256-iW4t6Q2Vv5LXXyKDAvXxoILQI38N/HxQtqXzvceRqsE=", + "type": "git", + "url": "file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophonty" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophonty" } }, "nixpkgs_2": { @@ -219,11 +330,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1696377142, - "narHash": "sha256-yTAncJAehy+w+4VLGZANE3kI6wa9+nklyD0mU49BJZE=", + "lastModified": 1698352941, + "narHash": "sha256-GmB2roGZyHYcgiqadaeffbKVnJGsBVa/1pEbCxSoRgo=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "2ac582da8e6d9fb4917bda7fc89ca5253365d6f5", + "rev": "e0c2f04abfc6f2314195e7dc3caff775cfd84ca0", "type": "github" }, "original": { @@ -238,7 +349,7 @@ "home-manager": "home-manager", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", + "nixpkgs-local": "nixpkgs-local", "programsdb": "programsdb", "stylix": "stylix" } @@ -246,16 +357,23 @@ "stylix": { "inputs": { "base16": "base16", + "base16-alacritty": "base16-alacritty", + "base16-fish": "base16-fish", + "base16-foot": "base16-foot", + "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", + "base16-vim": "base16-vim", "flake-compat": "flake-compat", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694375893, - "narHash": "sha256-oJGESNjJ/6o6tfuUavBZ7go4Oun7g9YKv7OqaQaY/80=", + "lastModified": 1698085074, + "narHash": "sha256-0lNNuIkkyG5FhJD/I9qIZ9dynZBWfIFSXe/YGUuEzSU=", "owner": "danth", "repo": "stylix", - "rev": "c3c9f4784b4f08f6676340126858d936edbce1fa", + "rev": "91e46dec675ec37fd3f9745754d10bb7e392db98", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 339e722..7489b0b 100755 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { - nixpkgs-master.url = "github:nixos/nixpkgs"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; stylix.url = "github:danth/stylix"; + nixpkgs-local.url = "git+file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophonty"; firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; @@ -22,17 +22,17 @@ }; outputs = { + self, + stylix, nixpkgs, home-manager, - stylix, - self, ... } @ inputs: let system = hostname: nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit inputs self nixpkgs; + inherit inputs self; }; modules = [ diff --git a/home-manager/bat.nix b/home-manager/bat.nix index 821f8cc..6f933c9 100644 --- a/home-manager/bat.nix +++ b/home-manager/bat.nix @@ -2,7 +2,7 @@ programs.bat = { enable = true; config = { - theme = "TwoDark"; + theme = "Nord"; italic-text = "always"; }; }; diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix index 59f2c8e..7f5e6a2 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox.nix @@ -20,14 +20,8 @@ search = { force = true; - default = "Rabbit Search"; + default = "DuckDuckGo"; engines = { - "Rabbit Search" = { - urls = [{template = "https://rabbitsearch.org/search?q={searchTerms}";}]; - iconUpdateURL = "https://rabbit-company.com/images/logo.png"; - updateInterval = 7 * 24 * 60 * 60 * 1000; # One week - }; - "Nix Package Search" = { urls = [ { @@ -84,7 +78,6 @@ "Bing".metaData.hidden = true; "Google".metaData.hidden = true; - "DuckDuckGo".metaData.hidden = true; "Amazon.ca".metaData.hidden = true; "eBay".metaData.hidden = true; }; diff --git a/quadraticpc/configuration.nix b/quadraticpc/configuration.nix index b470955..8ee64bc 100755 --- a/quadraticpc/configuration.nix +++ b/quadraticpc/configuration.nix @@ -9,6 +9,7 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; + plymouth.enable = true; kernelPackages = pkgs.linuxPackages_zen; kernelParams = ["sysrq_always_enabled=1"]; }; @@ -48,6 +49,10 @@ trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="]; }; + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" + ]; + services = { earlyoom = { enable = true; @@ -83,7 +88,7 @@ environment = { shellAliases = { - neofetch = "nvidia-offload neowofetch"; + neofetch = "neowofetch"; }; sessionVariables = { @@ -103,9 +108,11 @@ heroic aspell nodejs + ntfs3g killall ripgrep hyfetch + fractal inkscape r2modman pciutils @@ -118,10 +125,7 @@ android-studio nodePackages.pnpm hunspellDicts.en_CA-large - (pkgs.discord.override { - withOpenASAR = true; - withVencord = true; - }) + inputs.nixpkgs-local.legacyPackages.${system}.monophony ] ++ (with gnomeExtensions; [ caffeine @@ -129,6 +133,7 @@ app-hider appindicator search-light + blur-my-shell aylurs-widgets just-perfection burn-my-windows @@ -138,12 +143,14 @@ }; programs = { - steam.enable = true; wireshark = { enable = true; package = pkgs.wireshark; }; + steam.enable = true; + xfconf.enable = true; gamemode.enable = true; + noisetorch.enable = true; fish.interactiveShellInit = "neofetch"; }; diff --git a/quadraticpc/stylix.nix b/quadraticpc/stylix.nix index af9adfa..e568747 100755 --- a/quadraticpc/stylix.nix +++ b/quadraticpc/stylix.nix @@ -1,7 +1,9 @@ {pkgs, ...}: { stylix = { + polarity = "dark"; image = ./background.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; + targets.plymouth.blackBackground = false; fonts = { serif = {