Compare commits

..

No commits in common. "d9d58bbca984e28a38bf1f7f4d0d5ce707ab9086" and "209294075c4bb449010722a2fc72fd437a029fe9" have entirely different histories.

4 changed files with 51 additions and 76 deletions

View file

@ -137,7 +137,8 @@ if script_path.exists():
if sub_dir.name == "nix": if sub_dir.name == "nix":
continue continue
if not sub_dir.is_dir(): if not sub_dir.is_dir():
print(f"{colors.Colors.YELLOW}{colors.Colors.BOLD}WARNING: The path {colors.Colors.PURPLE}'{sub_dir}'{colors.Colors.YELLOW} is not a directory. Skipping alias creation for this path.{colors.Colors.END}") c = colors.Colors
print(f"{c.YELLOW}{c.BOLD}WARNING: The path {c.PURPLE}'{sub_dir}'{c.YELLOW} is not a directory. Skipping alias creation for this path.{c.END}")
continue continue
extension = f".{sub_dir.name}" extension = f".{sub_dir.name}"

View file

@ -6,11 +6,6 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-flatpak.url = "github:gmodena/nix-flatpak";
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
@ -26,7 +21,6 @@
}; };
outputs = { nixpkgs, home-manager, ... }@inputs: outputs = { nixpkgs, home-manager, ... }@inputs:
let let
user = "cswimr";
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
@ -76,23 +70,19 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
sharedModules =
[ inputs.plasma-manager.homeManagerModules.plasma-manager ];
backupFileExtension = "bak"; backupFileExtension = "bak";
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs; inherit pkgs;
system = system; system = system;
hostname = "eclipse"; hostname = "eclipse";
user = user;
}; };
users.${user} = { users.cswimr = {
imports = [ imports = [
./home-manager/user.nix ./home-manager/cswimr.nix
./home-manager/vscode.nix ./home-manager/vscode.nix
{ {
programs.git.extraConfig.user.signingkey = programs.git.extraConfig.user.signingkey = "0EC431A8DA8F8087";
"0EC431A8DA8F8087";
} }
]; ];
}; };
@ -140,23 +130,19 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
sharedModules =
[ inputs.plasma-manager.homeManagerModules.plasma-manager ];
backupFileExtension = "bak"; backupFileExtension = "bak";
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
inherit pkgs; inherit pkgs;
system = system; system = system;
hostname = "nebula"; hostname = "nebula";
user = user;
}; };
users.${user} = { users.cswimr = {
imports = [ imports = [
./home-manager/user.nix ./home-manager/cswimr.nix
./home-manager/vscode.nix ./home-manager/vscode.nix
{ {
programs.git.extraConfig.user.signingkey = programs.git.extraConfig.user.signingkey = "082F226A1D8C0860";
"082F226A1D8C0860";
} }
]; ];
}; };
@ -165,6 +151,6 @@
]; ];
}; };
}; };
}; };
} }

View file

@ -1,6 +1,6 @@
{ pkgs, config, user, ... }: { { pkgs, config, ... }: {
home.username = user; home.username = "cswimr";
home.homeDirectory = "/home/${user}"; home.homeDirectory = "/home/cswimr";
home.file = { home.file = {
".face.icon".source = ".face.icon".source =
@ -19,6 +19,8 @@
config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/glow.json"; config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/glow.json";
}; };
home.sessionPath = [ "/etc/nixos/scripts" ];
# link the configuration file in current directory to the specified location in home directory # link the configuration file in current directory to the specified location in home directory
# home.file.".config/i3/wallpaper.jpg".source = ./wallpaper.jpg; # home.file.".config/i3/wallpaper.jpg".source = ./wallpaper.jpg;
@ -46,7 +48,7 @@
# basic configuration of git, please change to your own # basic configuration of git, please change to your own
programs.git = { programs.git = {
enable = true; enable = true;
userName = user; userName = "cswimr";
userEmail = "seaswimmerthefsh@gmail.com"; userEmail = "seaswimmerthefsh@gmail.com";
extraConfig = { extraConfig = {
commit = { gpgsign = true; }; commit = { gpgsign = true; };

View file

@ -2,35 +2,6 @@
imports = [ <plasma-manager/modules> ]; imports = [ <plasma-manager/modules> ];
programs.plasma = { programs.plasma = {
enable = true; enable = true;
workspace = {
theme = "Breeze";
iconTheme = "Breeze Dark";
colorScheme = "CatppuccinMochaBlue";
cursor = {
size = 24;
theme = "Breeze";
};
windowDecorations = {
library = "org.kde.breeze";
theme = "Breeze";
};
};
hotkeys.commands = {
"spectacle-screenshot" = {
name = "Spectacle Screenshot";
command = "/etc/nixos/scripts/py/spectacle-screenshot.py";
comment =
"Take a screenshot of a region on the screen and automatically upload it to Zipline";
keys = [ "Print" "Meta+S" ];
};
"spectacle-recording" = {
name = "Spectacle Recording";
command = "/etc/nixos/scripts/py/spectacle-screenshot.py --record";
comment =
"Record a region on the screen and automatically upload it to Zipline";
keys = [ "Shift+Print" "Meta+Shift+S" ];
};
};
panels = [{ panels = [{
location = "bottom"; location = "bottom";
screen = "all"; screen = "all";
@ -62,32 +33,47 @@
} }
]; ];
}]; }];
window-rules = [{ #TODO: Convert everything below this to use higher level modules
description = "Application settings for Code"; shortcuts = {
match = { "services/net.local.spectacle-screenshot.py-2.desktop"."_launch" =
window-class = { "Shift+Print";
value = "code code-url-handler"; "services/net.local.spectacle-screenshot.py.desktop"."_launch" = "Print";
type = "exact"; "services/org.kde.spectacle.desktop"."ActiveWindowScreenShot" = [ ];
}; "services/org.kde.spectacle.desktop"."FullScreenScreenShot" = [ ];
}; "services/org.kde.spectacle.desktop"."RecordRegion" = [ ];
apply = { "services/org.kde.spectacle.desktop"."RecordScreen" = [ ];
desktopfile = "services/org.kde.spectacle.desktop"."RecordWindow" = [ ];
"/etc/profiles/per-user/cswimr/share/applications/code.desktop"; "services/org.kde.spectacle.desktop"."RectangularRegionScreenShot" = [ ];
}; "services/org.kde.spectacle.desktop"."WindowUnderCursorScreenShot" = [ ];
}]; "services/org.kde.spectacle.desktop"."_launch" = [ ];
spectacle.shortcuts = {
captureActiveWindow = [ ];
captureCurrentMonitor = [ ];
captureEntireDesktop = [ ];
captureRetangularRegion = [ ];
captureWindowUnderCursor = [ ];
launch = [ ];
}; };
configFile = { configFile = {
# These three plugins have no higher level modules "katerc"."KTextEditor Renderer"."Color Theme" = "Catppuccin Mocha";
"kded5rc"."Module-browserintegrationreminder"."autoload" = false;
"kded5rc"."Module-device_automounter"."autoload" = false;
"kwalletrc"."Wallet"."First Use" = false;
"kwinrc"."Desktops"."Id_1" = "f523b65c-46b8-4c91-94f4-9e247db75777";
"kwinrc"."Desktops"."Number" = 1;
"kwinrc"."Desktops"."Rows" = 1;
"kwinrc"."Plugins"."sheetEnabled" = true; "kwinrc"."Plugins"."sheetEnabled" = true;
"kwinrc"."Plugins"."wobblywindowsEnabled" = true; "kwinrc"."Plugins"."wobblywindowsEnabled" = true;
"kwinrc"."Plugins"."zoomEnabled" = false; "kwinrc"."Plugins"."zoomEnabled" = false;
"kwinrc"."org.kde.kdecoration2"."theme" = "Breeze";
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."Description" =
"Application settings for Code";
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."clientmachine" =
"localhost";
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."desktopfile" =
"/etc/profiles/per-user/cswimr/share/applications/code.desktop";
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."desktopfilerule" =
3;
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."wmclass" =
"code code-url-handler";
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."wmclasscomplete" =
true;
"kwinrulesrc"."700b0164-f5bb-47c9-93fc-2a4587821757"."wmclassmatch" = 1;
"kwinrulesrc"."General"."count" = 1;
"kwinrulesrc"."General"."rules" = "700b0164-f5bb-47c9-93fc-2a4587821757";
}; };
}; };
} }