This commit is contained in:
Adrian Gunnar Lauterer 2024-09-11 12:03:23 +02:00
parent b0248a8881
commit 8a2ddf5534
9 changed files with 271 additions and 37 deletions

214
flake.lock generated
View File

@ -1,5 +1,119 @@
{ {
"nodes": { "nodes": {
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1708890466,
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "665b3c6748534eb766c777298721cece9453fdae",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"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"
}
},
"devenv": { "devenv": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -75,6 +189,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@ -111,6 +241,22 @@
"type": "github" "type": "github"
} }
}, },
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1689549921,
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -134,6 +280,23 @@
"type": "github" "type": "github"
} }
}, },
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"repo": "gnome-shell",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -234,6 +397,22 @@
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": {
"locked": {
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706098335, "lastModified": 1706098335,
@ -422,10 +601,12 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"matrix-synapse-next": "matrix-synapse-next", "matrix-synapse-next": "matrix-synapse-next",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"ozai": "ozai", "ozai": "ozai",
"ozai-webui": "ozai-webui", "ozai-webui": "ozai-webui",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix",
"unstable": "unstable" "unstable": "unstable"
} }
}, },
@ -467,6 +648,39 @@
"type": "github" "type": "github"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"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_3",
"gnome-shell": "gnome-shell",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713897030,
"narHash": "sha256-ZPr1R0d9MVmyRX/+XpYsBdLBEBqYMtuyaAjYgWHMloU=",
"owner": "bluskript",
"repo": "stylix",
"rev": "6bc871ab352c9f18d1179daab9e392a4d46393af",
"type": "github"
},
"original": {
"owner": "bluskript",
"repo": "stylix",
"rev": "6bc871ab352c9f18d1179daab9e392a4d46393af",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View File

@ -87,7 +87,7 @@
home-manager.users."gunalx" = import ./home/full.nix; home-manager.users."gunalx" = import ./home/full.nix;
} }
#need to choose one. The nixos one has bootloader and display manager in addition to the home manager one. #need to choose one. The nixos one has bootloader and display manager in addition to the home manager one.
#inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
#inputs.stylix.homeManagerModules.stylix #inputs.stylix.homeManagerModules.stylix
]; ];
}; };

View File

@ -1,6 +1,7 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
./sshconfig.nix
]; ];
programs.nix-index = { programs.nix-index = {

View File

@ -4,7 +4,7 @@
./base.nix ./base.nix
./code.nix ./code.nix
./sway.nix ./sway.nix
#./stylix.nix ./stylix.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [

View File

@ -6,7 +6,8 @@
services.kanshi = { services.kanshi = {
enable = true; enable = true;
settings = [ settings = [
{ profile.name = "undocked"; {
profile.name = "undocked";
profile.outputs = [ profile.outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
@ -24,7 +25,6 @@
"\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 9, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 10, move workspace to eDP-1"
"\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1" "\${pkg.sway}/bin/swaymsg workspace 0, move workspace to eDP-1"
]; ];
} }
]; ];

19
home/sshconfig.nix Normal file
View File

@ -0,0 +1,19 @@
{ pkgs, lib, config, ... }:
{
imports = [
];
home.packages = with pkgs; [
openssh
sshfs
];
services.ssh-agent.enable = true;
programs.ssh = {
enable = true;
compression = true;
extraConfig = "";
};
}

View File

@ -1,17 +1,13 @@
{ pkgs, }: { pkgs, lib, ... }:
{ {
stylix.enable = true; stylix.enable = true;
stylix.image = pkgs.fetchurl { stylix.image = "/etc/nixos/nix-dotfiles/home/assets/wallpaper.jpg";
url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg";
sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50=";
};
stylix.base16Scheme = ${pkgs.base16-schemes}/share/themes/apathy.yaml; stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/apathy.yaml";
# stylix.fonts = { # stylix.fonts = {
# monospace = { # monospace = {
@ -39,9 +35,9 @@
applications = 1.0; applications = 1.0;
terminal = 0.8; terminal = 0.8;
desktop = 1.0; desktop = 1.0;
popups = 1.0; popups = 0.9;
}; };
stylix.polarity = dark # “light” or “either” stylix.polarity = "dark"; # “light” or “either”
} }

View File

@ -1,7 +1,8 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, ... }:
{ {
imports = [ imports = [
./wofi.nix #./fuzzle.nix
#./wofi.nix
./foot.nix ./foot.nix
./fonts.nix ./fonts.nix
./kanshi.nix ./kanshi.nix
@ -49,9 +50,11 @@
swayest-workstyle swayest-workstyle
#launcher #launcher
wofi #wofi
wofi-emoji #wofi-emoji
bemoji bemoji
fuzzel
#screenshots #screenshots
grim grim
@ -108,7 +111,7 @@ in {
config = rec { config = rec {
modifier = "Mod4"; modifier = "Mod4";
terminal = "footclient"; terminal = "footclient";
menu = "wofi --show run"; menu = "fuzzel";
bars = [{ bars = [{
fonts.size = 16.0; fonts.size = 16.0;
command = "waybar"; command = "waybar";

View File

@ -18,6 +18,8 @@ imports =
#libsForQt5.qt5ct #libsForQt5.qt5ct
#qt6Packages.qt6ct #qt6Packages.qt6ct
where-is-my-sddm-theme
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@ -34,7 +36,6 @@ imports =
ubuntu_font_family ubuntu_font_family
where-is-my-sddm-theme
]; ];