tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

work changes

Browse source
This commit is contained in:
Tristan 2023-12-11 10:09:20 +00:00
parent 126584cbcd
commit fb5c04a84a
7 changed files with 36 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
flake.lock generated
View file

@ -169,11 +169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702538064, "lastModified": 1703178811,
"narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=", "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e2e443ff24f9d75925e91b89d1da44b863734af", "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -213,11 +213,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1702576940, "lastModified": 1703245058,
"narHash": "sha256-oZAcNIJ9T49N9V+8HDRqPpSMp4R2+S+CO6iomsDYwU0=", "narHash": "sha256-TPuiNxl/KTyCoqFIMfNtX33Gtb46DOPrP9EQ13Zn6qI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f7cde9c92cb9e7c908f18ecf10ebdb366d0832b5", "rev": "7cec618fe47e457fe66ef772da00ef07665a8607",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -269,11 +269,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702312524, "lastModified": 1703013332,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c", "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +321,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1702559747, "lastModified": 1703004037,
"narHash": "sha256-d6AmQp3M00WMPJquNfGVzIol5iojD1pi9slek+4N9VY=", "narHash": "sha256-ceYPl/ML0kQBCUaOw0gG2TxHHEl4k9xivFpsdlKidIQ=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "41d218597590a89324a4b7c50cf0bf088a7214ba", "rev": "d14ac4912a9ab02f8b49b761e9e4b9ae836171af",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
global/system.nix
View file

@ -11,6 +11,11 @@ user: { config, pkgs, lib, ... }:
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
}; };
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
];
nix.settings.trusted-users = [ "root" user ]; nix.settings.trusted-users = [ "root" user ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;

4
hardware/displays.nix
View file

@ -19,7 +19,7 @@
x = 1920; x = 1920;
y = 0; y = 0;
}; };
wallpaper = "/home/tristan/Pictures/backgrounds/nier.jpg"; wallpaper = "/home/tristan/Pictures/backgrounds/wallhaven-qzlyzd.jpg";
rotation = 1; rotation = 1;
} }
{ {
@ -29,7 +29,7 @@
x = 0; x = 0;
y = 1080; y = 1080;
}; };
wallpaper = "/home/tristan/Pictures/backgrounds/nix-wallpaper-watersplash.png"; wallpaper = "/home/tristan/Pictures/backgrounds/nix-soft.png";
} }
]; ];
}; };

4
hardware/work.nix
View file

@ -91,6 +91,10 @@
system.stateVersion = "22.11"; # do not change system.stateVersion = "22.11"; # do not change
home-manager.users.${user}.imports = [{ home-manager.users.${user}.imports = [{
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = {
eDP-1 = 5;
};
}]; }];
} }

16
lib/modules/laptop.nix
View file

@ -28,14 +28,14 @@ in
gaps_out = 10; gaps_out = 10;
border_size = 3; border_size = 3;
}; };
}; bind = [
bind = [ "SUPER_SHIFT, Q, killactive,"
"SUPER_SHIFT, Q, killactive," ];
]; "device:at-translated-set-2-keyboard" = {
"device:at-translated-set-2-keyboard" = { kb_variant = "dvorak,";
kb_variant = "dvorak,"; kb_layout = "gb,gb";
kb_layout = "gb,gb"; kb_options = "grp:alt_shift_toggle,caps:escape";
kb_options = "grp:alt_shift_toggle,caps:escape"; };
}; };
}; };
}]; }];

8
lib/modules/wayland.nix
View file

@ -128,7 +128,7 @@ in
resize_on_border = true; resize_on_border = true;
layout = "master"; layout = "master";
# "col.active_border" = "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)"; # "col.active_border" = "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)";
border_size = 5; border_size = lib.mkDefault 5;
}; };
master = { master = {
mfact = 0.7; mfact = 0.7;
@ -220,10 +220,11 @@ in
}; };
mpris = { mpris = {
format = "{player_icon} {artist} - {title}"; format = "{player_icon} {artist} - {title}";
format-paused = "{status_icon} {artist} - {title}"; format-paused = "{status_icon} {player_icon} {artist} - {title}";
player-icons = { player-icons = {
default = "▶️"; default = "▶️";
mpd = "🎵"; mpd = "🎵";
kdeconnect = "☎️";
}; };
status-icons = { status-icons = {
paused = "⏸️"; paused = "⏸️";
@ -232,6 +233,7 @@ in
battery = { battery = {
format = "{icon} {capacity}%"; format = "{icon} {capacity}%";
format-icons = [ "🤏" "🪫" "🔋" "🔋" ]; format-icons = [ "🤏" "🪫" "🔋" "🔋" ];
format-charging = "🔌 {capacity}%";
states = { states = {
warning = 30; warning = 30;
critical = 15; critical = 15;
@ -244,7 +246,6 @@ in
target = "graphical-session.target"; target = "graphical-session.target";
}; };
style = '' style = ''
* { * {
min-height: 0; min-height: 0;
} }
@ -279,7 +280,6 @@ in
#tray { #tray {
min-width: 5rem; min-width: 5rem;
} }
''; '';
}; };

1
lib/modules/work.nix
View file

@ -76,6 +76,7 @@ with lib;
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
# nonfree vscode required for dev containers # nonfree vscode required for dev containers
"vscode" "vscode"
"steam-run"
]; ];
networking = { networking = {