From f5cec9b929a79ff78a488693141498874b645a56 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Tue, 25 Feb 2025 11:53:08 +0000 Subject: [PATCH] Some changes --- flake.nix | 2 +- home-manager.nix | 24 +++--- .../{firefox.nix => firefox/default.nix} | 2 +- .../{firefox-nord.css => firefox/nord.css} | 0 modules/common-desktop/keyboard.nix | 2 +- modules/common-desktop/piper.nix | 2 +- modules/common/command-not-found.nix | 3 +- modules/common/fish.nix | 4 +- modules/common/quadradical.nix | 2 +- wrappers/common-desktop/vscode/default.nix | 21 ------ wrappers/common-desktop/vscodium/default.nix | 23 ++++++ .../common-desktop/vscodium/keybindings.json | 10 +++ .../common-desktop/vscodium/settings.json | 75 +++++++++++++++++++ wrappers/common/bat.nix | 2 +- wrappers/common/fish.nix | 6 ++ wrappers/common/neofetch/default.nix | 2 +- 16 files changed, 134 insertions(+), 46 deletions(-) rename home-manager/{firefox.nix => firefox/default.nix} (95%) rename home-manager/{firefox-nord.css => firefox/nord.css} (100%) delete mode 100644 wrappers/common-desktop/vscode/default.nix create mode 100644 wrappers/common-desktop/vscodium/default.nix create mode 100644 wrappers/common-desktop/vscodium/keybindings.json create mode 100644 wrappers/common-desktop/vscodium/settings.json create mode 100644 wrappers/common/fish.nix diff --git a/flake.nix b/flake.nix index e4de62b..c420f20 100755 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; stylix.url = "github:danth/stylix"; + nix-gaming.url = "github:fufexan/nix-gaming"; firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; }; - nix-gaming.url = "github:fufexan/nix-gaming"; programsdb = { url = "github:wamserma/flake-programs-sqlite"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager.nix b/home-manager.nix index 20a112f..20218cc 100755 --- a/home-manager.nix +++ b/home-manager.nix @@ -1,20 +1,18 @@ -{inputs, ...}: { +{ + inputs, + dirUtils, + ... +}: { home-manager = { useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = {inherit inputs;}; - users.quadradical = { - home = { - username = "quadradical"; - homeDirectory = "/home/quadradical"; - }; + users.quadradical.home = { + username = "quadradical"; + homeDirectory = "/home/quadradical"; }; - sharedModules = [ - {home.stateVersion = "23.11";} - ./home-manager/gtk.nix - ./home-manager/vscode.nix - ./home-manager/firefox.nix - {stylix.targets.hyprland.enable = false;} - ]; + sharedModules = + [{home.stateVersion = "23.11";}] + ++ dirUtils.dirFiles ./home-manager; }; } diff --git a/home-manager/firefox.nix b/home-manager/firefox/default.nix similarity index 95% rename from home-manager/firefox.nix rename to home-manager/firefox/default.nix index 47efebb..3ceed03 100644 --- a/home-manager/firefox.nix +++ b/home-manager/firefox/default.nix @@ -1,6 +1,6 @@ {inputs, ...}: { home.file.".mozilla/firefox/quadradical/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme; - home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./firefox-nord.css; + home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./nord.css; programs.firefox = { enable = true; diff --git a/home-manager/firefox-nord.css b/home-manager/firefox/nord.css similarity index 100% rename from home-manager/firefox-nord.css rename to home-manager/firefox/nord.css diff --git a/modules/common-desktop/keyboard.nix b/modules/common-desktop/keyboard.nix index 17ba71e..215a8f9 100644 --- a/modules/common-desktop/keyboard.nix +++ b/modules/common-desktop/keyboard.nix @@ -1 +1 @@ -{ hardware.keyboard.qmk.enable = true; } +{hardware.keyboard.qmk.enable = true;} diff --git a/modules/common-desktop/piper.nix b/modules/common-desktop/piper.nix index 83002a7..b03cfee 100644 --- a/modules/common-desktop/piper.nix +++ b/modules/common-desktop/piper.nix @@ -1,4 +1,4 @@ {pkgs, ...}: { services.ratbagd.enable = true; environment.systemPackages = [pkgs.piper]; -} \ No newline at end of file +} diff --git a/modules/common/command-not-found.nix b/modules/common/command-not-found.nix index 634b337..2d3edb7 100644 --- a/modules/common/command-not-found.nix +++ b/modules/common/command-not-found.nix @@ -3,6 +3,5 @@ pkgs, ... }: { - programs.command-not-found.dbPath = "/etc/programs.sqlite"; - environment.etc."programs.sqlite".source = inputs.programsdb.packages.${pkgs.system}.programs-sqlite; + programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite; } diff --git a/modules/common/fish.nix b/modules/common/fish.nix index 0ccbf41..8c8dea6 100644 --- a/modules/common/fish.nix +++ b/modules/common/fish.nix @@ -6,10 +6,8 @@ neofetch ''; }; + environment = { - # systemPackages = with pkgs.fishPlugins; [ - # ]; - sessionVariables.fish_greeting = ""; shells = [pkgs.fish]; shellAliases = { # Utility diff --git a/modules/common/quadradical.nix b/modules/common/quadradical.nix index 11ebd72..44a34bb 100644 --- a/modules/common/quadradical.nix +++ b/modules/common/quadradical.nix @@ -2,6 +2,6 @@ users.users.quadradical = { isNormalUser = true; description = "QuadRadical"; - extraGroups = ["networkmanager" "wheel" "libvirtd"]; + extraGroups = ["wheel"]; }; } diff --git a/wrappers/common-desktop/vscode/default.nix b/wrappers/common-desktop/vscode/default.nix deleted file mode 100644 index 241c848..0000000 --- a/wrappers/common-desktop/vscode/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{pkgs, ...}: { - # wrappers.vscode = { - # basePackage = pkgs.vscodium; - - # pathAdd = with pkgs.vscode-extensions; [ - # mkhl.direnv - # eamodio.gitlens - # jnoortheen.nix-ide - # timonwong.shellcheck - # usernamehw.errorlens - # ritwickdey.liveserver - # dbaeumer.vscode-eslint - # esbenp.prettier-vscode - # oderwat.indent-rainbow - # astro-build.astro-vscode - # pkief.material-icon-theme - # streetsidesoftware.code-spell-checker - # arcticicestudio.nord-visual-studio-code - # ]; - # }; -} diff --git a/wrappers/common-desktop/vscodium/default.nix b/wrappers/common-desktop/vscodium/default.nix new file mode 100644 index 0000000..381ce0c --- /dev/null +++ b/wrappers/common-desktop/vscodium/default.nix @@ -0,0 +1,23 @@ +{pkgs, ...}: { +# wrappers.vscode = { +# basePackage = pkgs.vscodium; +# flags = ["--user-data-dir" ./.]; +# +# pathAdd = with pkgs.vscode-extensions; [ +# mkhl.direnv +# eamodio.gitlens +# dart-code.flutter +# jnoortheen.nix-ide +# timonwong.shellcheck +# usernamehw.errorlens +# ritwickdey.liveserver +# dbaeumer.vscode-eslint +# esbenp.prettier-vscode +# oderwat.indent-rainbow +# astro-build.astro-vscode +# pkief.material-icon-theme +# streetsidesoftware.code-spell-checker +# arcticicestudio.nord-visual-studio-code +# ]; +# }; +} diff --git a/wrappers/common-desktop/vscodium/keybindings.json b/wrappers/common-desktop/vscodium/keybindings.json new file mode 100644 index 0000000..a1fccc9 --- /dev/null +++ b/wrappers/common-desktop/vscodium/keybindings.json @@ -0,0 +1,10 @@ +[ + { + "command": "workbench.action.files.saveAll", + "key": "ctrl+s" + }, + { + "command": "-workbench.action.files.save", + "key": "ctrl+s" + } +] diff --git a/wrappers/common-desktop/vscodium/settings.json b/wrappers/common-desktop/vscodium/settings.json new file mode 100644 index 0000000..8fb1481 --- /dev/null +++ b/wrappers/common-desktop/vscodium/settings.json @@ -0,0 +1,75 @@ +{ + "[astro]": { + "editor.defaultFormatter": "astro-build.astro-vscode" + }, + "[nix]": { + "editor.defaultFormatter": "jnoortheen.nix-ide", + "editor.formatOnSave": true + }, + "[yaml]": { + "editor.defaultFormatter": "redhat.vscode-yaml" + }, + "dart.checkForSdkUpdates": false, + "dart.debugExternalPackageLibraries": true, + "dart.debugSdkLibraries": true, + "dart.runPubGetOnPubspecChanges": "never", + "diffEditor.ignoreTrimWhitespace": false, + "editor.bracketPairColorization.enabled": true, + "editor.codeActionsOnSave": { + "source.fixAll": "explicit" + }, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.detectIndentation": false, + "editor.fontLigatures": true, + "editor.formatOnSave": true, + "editor.guides.bracketPairs": "active", + "editor.inlineSuggest.enabled": true, + "editor.insertSpaces": false, + "editor.minimap.enabled": false, + "editor.unicodeHighlight.nonBasicASCII": false, + "editor.wordWrap": "on", + "errorLens.enabledDiagnosticLevels": [ + "error" + ], + "explorer.confirmDelete": false, + "explorer.confirmDragAndDrop": false, + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.expand": false, + "git.confirmSync": false, + "git.enableSmartCommit": true, + "git.mergeEditor": true, + "git.openRepositoryInParentFolders": "never", + "gitlens.codeLens.enabled": false, + "gitlens.currentLine.enabled": false, + "gitlens.hovers.currentLine.over": "line", + "gitlens.statusBar.enabled": false, + "indentRainbow.ignoreErrorLanguages": [ + "*" + ], + "javascript.format.semicolons": "remove", + "javascript.updateImportsOnFileMove.enabled": "always", + "nix.enableLanguageServer": true, + "nix.serverPath": "/nix/store/3b0kiw6h7qzqgnx3kdl57m3qkzvh37j0-nil-2024-08-06/bin/nil", + "nix.serverSettings": { + "nil": { + "formatting": { + "command": [ + "alejandra" + ] + } + } + }, + "prettier.semi": false, + "prettier.tabWidth": 4, + "redhat.telemetry.enabled": false, + "terminal.integrated.shellIntegration.enabled": false, + "typescript.updateImportsOnFileMove.enabled": "always", + "window.dialogStyle": "custom", + "window.menuBarVisibility": "compact", + "window.titleBarStyle": "custom", + "window.zoomLevel": 1, + "workbench.colorTheme": "Nord", + "workbench.iconTheme": "material-icon-theme", + "workbench.sideBar.location": "right", + "workbench.startupEditor": "none" +} diff --git a/wrappers/common/bat.nix b/wrappers/common/bat.nix index b619622..5271789 100644 --- a/wrappers/common/bat.nix +++ b/wrappers/common/bat.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { wrappers.bat = { basePackage = pkgs.bat; - flags = ["--theme=Nord"]; + flags = ["--theme" "Nord"]; }; } diff --git a/wrappers/common/fish.nix b/wrappers/common/fish.nix new file mode 100644 index 0000000..d72a4bd --- /dev/null +++ b/wrappers/common/fish.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + wrappers.fish = { + basePackage = pkgs.fish; + env.fish_greeting.value = ""; + }; +} diff --git a/wrappers/common/neofetch/default.nix b/wrappers/common/neofetch/default.nix index 1609014..2143a75 100644 --- a/wrappers/common/neofetch/default.nix +++ b/wrappers/common/neofetch/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { wrappers.neofetch = { - basePackage = pkgs.hyfetch; + basePackage = pkgs.hyfetch; # Neowofetch flags = [ "--config" ./neofetch.conf