This commit is contained in:
xqtc161 2024-03-30 18:14:53 +01:00
commit 1361a5fbca
13 changed files with 240 additions and 50 deletions

View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1710209440,
"narHash": "sha256-1JwFo3u2aVrvpz12OotjCK51EQ0hEDI7xSG7CEvTSk8=",
"lastModified": 1711325419,
"narHash": "sha256-dKZUWMB4py9rhefu1lsrCrwksK4WX/dtW8Ma807KyPA=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "bdc68b494d6a26c9457f4841ab1a6109b12a33e6",
"rev": "93e85575f63b32b9996676513d95288fc1c87ca9",
"type": "github"
},
"original": {
@ -49,11 +49,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1711124527,
"narHash": "sha256-nCTtAShwdthp+scvmLevc06gtY9gglXq2vCdsszTqIA=",
"lastModified": 1711500952,
"narHash": "sha256-YEF6ycTwkcuZq1ocon+JahHgwuQLQtpH2js1j+gN8K8=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "d1f6bbea177a3542d9ad3ecead77089b65e09963",
"rev": "d0df0c83bfe2e7ed6e26259a289d7056c4001ced",
"type": "gitlab"
},
"original": {
@ -198,6 +198,24 @@
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -227,11 +245,11 @@
]
},
"locked": {
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"lastModified": 1711625603,
"narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
"type": "github"
},
"original": {
@ -249,11 +267,11 @@
]
},
"locked": {
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"lastModified": 1711604890,
"narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
"type": "github"
},
"original": {
@ -270,11 +288,11 @@
]
},
"locked": {
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"lastModified": 1711591334,
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297",
"type": "github"
},
"original": {
@ -285,11 +303,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1711274671,
"narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=",
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github"
},
"original": {
@ -301,27 +319,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1709961763,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1711283748,
"narHash": "sha256-k/odu9SNTrQ2dntKMZmaaPQbz0rw4PSh5FaAFUGtzgM=",
"lastModified": 1711747752,
"narHash": "sha256-iEeV/qrWaKfbdhR49B5F/sm/k0yxiGUAE5eXaoLSFNs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bb13987023c3dec3ccc8d7500cc068e89327df6d",
"rev": "387ef8710bf6ec095dea0829462f3d76a8a7f31f",
"type": "github"
},
"original": {
@ -349,11 +367,27 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"lastModified": 1711523803,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"type": "github"
},
"original": {
@ -376,11 +410,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1711199922,
"narHash": "sha256-Oz5WNOPp95K4JLyoNQKyEdaUM5JzliC62jwTpGPqYNE=",
"lastModified": 1711745924,
"narHash": "sha256-ZYVrOg12pWNbY1hx1lOu3cwER6xalEHUUIXnfbkCtUY=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "7170aad28139cd3629b2b6ce4c9272bf41c2ad45",
"rev": "4f83bcf2906c1c933316396221024f3482a7b086",
"type": "github"
},
"original": {
@ -404,11 +438,11 @@
]
},
"locked": {
"lastModified": 1710923068,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"lastModified": 1711519547,
"narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
"type": "github"
},
"original": {
@ -426,7 +460,8 @@
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs-master": "nixpkgs-master",
"nixvim": "nixvim"
"nixvim": "nixvim",
"spicetify-nix": "spicetify-nix"
}
},
"rust-overlay": {
@ -445,6 +480,25 @@
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1704167711,
"narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
"owner": "the-argus",
"repo": "spicetify-nix",
"rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
"type": "github"
},
"original": {
"owner": "the-argus",
"repo": "spicetify-nix",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
@ -489,6 +543,21 @@
"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"
}
}
},
"root": "root",

View file

@ -10,6 +10,7 @@
};
};
#inputs.agenix.url = "github:ryantm/agenix";
inputs.spicetify-nix.url = "github:the-argus/spicetify-nix";
inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master";
inputs.nixvim = {

53
home/config-files/maxfetch.sh Executable file
View file

@ -0,0 +1,53 @@
#!/usr/bin/env bash
unicode=" "
version="1.2.0"
_black=$(tput setaf 0)
red=$(tput setaf 1)
green=$(tput setaf 2)
yellow=$(tput setaf 3)
blue=$(tput setaf 4)
magenta=$(tput setaf 5)
cyan=$(tput setaf 6)
_white=$(tput setaf 7)
_bright=$(tput bold)
normal=$(tput sgr0)
_underline=$(tput smul)
up=$(uptime | awk -F'( |,|:)+' '{
d=h=m=0;
if ($7=="min")
m=$6;
else {
if ($7~/^day/) { d=$6; h=$8; m=$9}
else {h=$6;m=$7}
}
}
{ print h+0,"h",m+0,"m" }
')
up=$(sed -e "s/ h/h/g" <<< ${up})
up=$(sed -e "s/ m/m/g" <<< ${up})
pkgs=$(nix-store --query --requisites /run/current-system | wc -l)
fetch() {
echo "${cyan}$(tput bold) _ ___ ____ ____ ${normal}$(tput sgr0)"
echo "${cyan}$(tput bold) / |/ (_)_ __/ __ \/ __/ ${normal}$(tput sgr0)"
echo "${cyan}$(tput bold) / / /\ \ / /_/ /\ \ ${normal}$(tput sgr0)"
echo "${cyan}$(tput bold) /_/|_/_//_\_"'\\'"____/___/ ${normal}$(tput sgr0)"
echo ""
echo " ╭─────────────╮ "
echo "${red}${normal} user │ ${red}$(whoami)${normal}"
echo "${yellow}${normal} distro │ ${yellow}$(sed -nE "s@PRETTY_NAME=\"([^\"]*)\"@\1@p" /etc/os-release)${normal} "
echo "${green}${normal} kernel │ ${green}$(uname -r)${normal} "
echo "${cyan}󱂬 ${normal} de/wm │ ${cyan}$XDG_CURRENT_DESKTOP${normal} "
echo "${blue}${normal} uptime │ ${blue}${up}${normal} "
echo "${magenta}${normal} shell │ ${magenta}$(echo ${SHELL##*/})${normal} "
echo "${red}󰏖 ${normal} pkgs │ ${red}${pkgs}${normal} "
echo " ├─────────────┤ "
echo "${_white}${normal}colors │${_white}$unicode${normal}${red}$unicode${normal}${yellow}$unicode${normal}${green}$unicode${normal}${cyan}$unicode${normal}${blue}$unicode${normal}${magenta}$unicode${normal}${_black}$unicode${normal}"
echo " ╰─────────────╯ "
}
fetch && exit 0

View file

@ -13,6 +13,7 @@
./modules/gtk.nix
./modules/home-pkgs.nix
./modules/git.nix
./modules/spicetify.nix
#./modules/ssh.nix
];
home.username = "xqtc";

View file

@ -9,6 +9,23 @@
color-scheme = "prefer-dark";
cursor-theme = "Adwaita";
};
"org/gnome/shell" = {
disable-user-extensions = false;
# `gnome-extensions list` for a list
enabled-extensions = [
"user-theme@gnome-shell-extensions.gcampax.github.com"
"trayIconsReloaded@selfmade.pl"
"Vitals@CoreCoding.com"
# "dash-to-panel@jderose9.github.com"
"blur-my-shell@aunetx"
"sound-output-device-chooser@kgshank.net"
"space-bar@luchrioh"
];
};
"org/gnome/shell/extensions/user-theme" = {
name = "Catppuccin-Mocha-Compact-Pink-Dark";
};
};
gtk = {
@ -33,5 +50,13 @@
'';
};
};
home.sessionVariables.GTK_THEME = "palenight";
home.packages = with pkgs; [
gnomeExtensions.user-themes
gnomeExtensions.blur-my-shell
gnomeExtensions.tray-icons-reloaded
gnomeExtensions.vitals
gnomeExtensions.dash-to-panel
gnomeExtensions.sound-output-device-chooser
gnomeExtensions.space-bar
];
}

View file

@ -10,14 +10,17 @@
pkgs.steam
pkgs.protonup-qt
pkgs.via
pkgs.spotify
# pkgs.spotify
]
else [];
maxfetch = pkgs.writeScriptBin "maxfetch" (builtins.readFile ../config-files/maxfetch.sh);
in {
home.packages =
[
pkgs.neofetch
pkgs.uwufetch
maxfetch
pkgs.btop
pkgs.iftop
pkgs.ranger
@ -57,6 +60,8 @@ in {
pkgs.neovide
pkgs.xournalpp
pkgs.ripgrep
pkgs.yubioath-flutter

View file

@ -29,6 +29,14 @@
indent-blankline.enable = true;
lualine.enable = true;
lsp-format = {enable = true;};
copilot-lua = {
enable = true;
suggestion = {
enabled = false;
};
panel.enabled = false;
};
copilot-cmp.enable = true;
lsp = {
enable = true;
servers = {
@ -76,6 +84,7 @@
{name = "path";}
{name = "buffer";}
{name = "luasnip";}
{name = "copilot";}
];
#mapping = {
# __raw = ''

View file

@ -14,7 +14,7 @@
nushell = {
enable = true;
shellAliases = {ls = "eza -l --icons --group-directories-first";};
extraConfig = "uwufetch --image";
extraConfig = "maxfetch";
configFile = {
text = ''
$env.config = {

View file

@ -0,0 +1,20 @@
{ pkgs, lib, inputs, ... }:
let
spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
in
{
imports = [ inputs.spicetify-nix.homeManagerModule ];
programs.spicetify =
{
enable = true;
theme = spicePkgs.themes.catppuccin;
colorScheme = "mocha";
enabledExtensions = with spicePkgs.extensions; [
fullAppDisplay
shuffle # shuffle+ (special characters are sanitized out of ext names)
# hidePodcasts
];
};
}

View file

@ -63,5 +63,7 @@
font = "Hack Nerd Font 15";
backgroundColor = "#1e1e2e";
textColor = "#cdd6f4";
icons = true;
actions = true;
};
}

View file

@ -60,7 +60,6 @@
#services.xserver.displayManager.gdm.enable = true;
#services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";

View file

@ -61,7 +61,7 @@
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
# package = config.boot.kernelPackages.nvidiaPackages.stable;
};
# Use the systemd-boot EFI boot loader.
@ -93,10 +93,11 @@
# Enable the X11 windowing system.
services.xserver.enable = true;
#services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.enable = true;
#services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma6.enable = true;
services.xserver.displayManager.defaultSession = "plasma";
# services.xserver.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.gnome.enable = true;
# services.xserver.displayManager.defaultSession = "plasma";
services.xserver.videoDrivers = ["nvidia"];
virtualisation.docker.enable = true;

View file

@ -17,11 +17,16 @@
config,
lib,
pkgs,
inputs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
../../../common
../../../modules/home-manager.nix
../../gc.nix
../../antivirus.nix
];
nixpkgs.config.allowUnfree = true;
@ -81,12 +86,12 @@
# };
# Enable the X11 windowing system.
#services.xserver.enable = true;
#services.xserver.displayManager.gdm.enable = true;
services.xserver.enable = true;
services.xserver.displayManager.gdm.enable = true;
#services.xserver.displayManager.ly.enable = true;
#services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.enable = true;
#services.xserver.displayManager.defaultSession = "plasmawayland";
#services.xserver.videoDrivers = ["nvidia"];
services.xserver.videoDrivers = ["nvidia"];
services.blueman.enable = true;