diff --git a/flake.lock b/flake.lock index 2d5c85e..003eb79 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,119 @@ { "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": { "inputs": { "flake-compat": "flake-compat_2", @@ -75,6 +189,22 @@ "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": { "inputs": { "systems": "systems" @@ -111,6 +241,22 @@ "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": { "inputs": { "nixpkgs": [ @@ -134,6 +280,23 @@ "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": { "inputs": { "nixpkgs": [ @@ -234,6 +397,22 @@ "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": { "locked": { "lastModified": 1706098335, @@ -422,10 +601,12 @@ "home-manager": "home-manager", "matrix-synapse-next": "matrix-synapse-next", "nix-minecraft": "nix-minecraft", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "ozai": "ozai", "ozai-webui": "ozai-webui", "sops-nix": "sops-nix", + "stylix": "stylix", "unstable": "unstable" } }, @@ -467,6 +648,39 @@ "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": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 347ebae..853b02d 100644 --- a/flake.nix +++ b/flake.nix @@ -87,7 +87,7 @@ 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. - #inputs.stylix.nixosModules.stylix + inputs.stylix.nixosModules.stylix #inputs.stylix.homeManagerModules.stylix ]; }; diff --git a/home/base.nix b/home/base.nix index 8662134..befcb11 100644 --- a/home/base.nix +++ b/home/base.nix @@ -1,6 +1,7 @@ { pkgs, lib, ... }: { imports = [ + ./sshconfig.nix ]; programs.nix-index = { diff --git a/home/full.nix b/home/full.nix index 4762a4b..282a420 100644 --- a/home/full.nix +++ b/home/full.nix @@ -4,7 +4,7 @@ ./base.nix ./code.nix ./sway.nix - #./stylix.nix + ./stylix.nix ]; home.packages = with pkgs; [ diff --git a/home/kanshi.nix b/home/kanshi.nix index f8254be..b3e41c8 100644 --- a/home/kanshi.nix +++ b/home/kanshi.nix @@ -6,26 +6,26 @@ services.kanshi = { enable = true; settings = [ - { profile.name = "undocked"; - profile.outputs = [ - { - criteria = "eDP-1"; - } - ]; - profile.exec = [ - "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1" - "\${pkg.sway}/bin/swaymsg workspace 8, 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 0, move workspace to eDP-1" - - ]; + { + profile.name = "undocked"; + profile.outputs = [ + { + criteria = "eDP-1"; + } + ]; + profile.exec = [ + "\${pkg.sway}/bin/swaymsg workspace 1, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 2, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 3, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 4, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 5, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 6, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 7, move workspace to eDP-1" + "\${pkg.sway}/bin/swaymsg workspace 8, 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 0, move workspace to eDP-1" + ]; } ]; diff --git a/home/sshconfig.nix b/home/sshconfig.nix new file mode 100644 index 0000000..fa37969 --- /dev/null +++ b/home/sshconfig.nix @@ -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 = ""; + }; +} + diff --git a/home/stylix.nix b/home/stylix.nix index a789f00..45a11d1 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -1,17 +1,13 @@ -{ pkgs, … }: - +{ pkgs, lib, ... }: { stylix.enable = true; - stylix.image = pkgs.fetchurl { - url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; - sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; - }; + stylix.image = "/etc/nixos/nix-dotfiles/home/assets/wallpaper.jpg"; - stylix.base16Scheme = ”${pkgs.base16-schemes}/share/themes/apathy.yaml”; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/apathy.yaml"; # stylix.fonts = { # monospace = { @@ -39,9 +35,9 @@ applications = 1.0; terminal = 0.8; desktop = 1.0; - popups = 1.0; + popups = 0.9; }; - stylix.polarity = “dark” # “light” or “either” + stylix.polarity = "dark"; # “light” or “either” } diff --git a/home/sway.nix b/home/sway.nix index 01cc695..9f118f0 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -1,7 +1,8 @@ { pkgs, config, lib, ... }: { imports = [ - ./wofi.nix + #./fuzzle.nix + #./wofi.nix ./foot.nix ./fonts.nix ./kanshi.nix @@ -49,9 +50,11 @@ swayest-workstyle #launcher - wofi - wofi-emoji - bemoji + #wofi + #wofi-emoji + bemoji + fuzzel + #screenshots grim @@ -108,7 +111,7 @@ in { config = rec { modifier = "Mod4"; terminal = "footclient"; - menu = "wofi --show run"; + menu = "fuzzel"; bars = [{ fonts.size = 16.0; command = "waybar"; diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 7e1a2e4..63b0784 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -18,6 +18,8 @@ imports = #libsForQt5.qt5ct #qt6Packages.qt6ct + + where-is-my-sddm-theme ]; fonts.packages = with pkgs; [ @@ -34,7 +36,6 @@ imports = ubuntu_font_family - where-is-my-sddm-theme ];