diff --git a/configuration.nix b/configuration.nix index 7ca4127..8cfc248 100644 --- a/configuration.nix +++ b/configuration.nix @@ -26,6 +26,7 @@ nixpkgs.config.permittedInsecurePackages = [ "freeimage-unstable-2021-11-01" + "openssl-1.1.1w" ]; networking.hostName = "krizej-pc"; @@ -33,37 +34,53 @@ time.timeZone = "Europe/Warsaw"; - services.libinput = { - enable = true; - touchpad = { - naturalScrolling = false; # it's reversed on my laptop for some reason - tapping = true; - tappingButtonMap = "lmr"; - scrollMethod = "edge"; + # services.libinput = { + # enable = true; + # touchpad = { + # naturalScrolling = false; # it's reversed on my laptop for some reason + # tapping = true; + # tappingButtonMap = "lmr"; + # scrollMethod = "edge"; + # }; + # }; + + programs.sway.enable = true; + + services = { + xserver = { + enable = true; + xkb.layout = "pl"; + + windowManager.i3.enable = true; + + displayManager = { + sessionCommands = '' + xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary + xrandr --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 + xset r rate 180 50 + ''; + }; + + autoRepeatDelay = 180; + autoRepeatInterval = 50; }; - }; - # programs.sway.enable = true; - - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - windowManager.i3.enable = true; - - xkb.layout = "pl"; - - # this shit doesn't actually work - autoRepeatDelay = 180; - autoRepeatInterval = 50; - # this does - displayManager.sessionCommands = "xset r rate 180 50\n"; - + displayManager = { + defaultSession = "none+i3"; + sddm = { + enable = true; + theme = "sddm-i3-theme"; + }; + }; }; fonts = { enableDefaultPackages = true; packages = with pkgs; [ jetbrains-mono + dejavu_fonts + corefonts + vistafonts ]; fontconfig.defaultFonts = { serif = [ "JetBrains Mono NL" ]; @@ -116,6 +133,7 @@ gcc unzip python311 + python39 ripgrep gnomeExtensions.user-themes xdg-user-dirs @@ -126,10 +144,24 @@ xclip tcl pkg-config + fish tree + openssl_1_1 + sddm-i3-theme ]; - documentation.dev.enable = true; + documentation = { + enable = true; + dev.enable = true; + doc.enable = false; + info.enable = false; + man = { + enable = true; + generateCaches = false; + man-db.enable = false; + mandoc.enable = true; + }; + }; programs.gnupg.agent = { enable = true; diff --git a/files/sddm-bg.png b/files/sddm-bg.png new file mode 100644 index 0000000..69eca87 Binary files /dev/null and b/files/sddm-bg.png differ diff --git a/home.nix b/home.nix index 59a4551..a9605b5 100644 --- a/home.nix +++ b/home.nix @@ -50,6 +50,9 @@ in rec { yad pcmanfm gvfs + sqlitebrowser + xdg-desktop-portal + xdg-desktop-portal-gnome # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the # # parentheses. Maybe you want to install Nerd Fonts with a limited number of @@ -94,7 +97,6 @@ in rec { ".config/i3/i3gtk.css".source = files/i3gtk.css; # FIXME not .vim bro!!!!!!!!! ".vim/colors/darcula.vim".source = files/darcula.vim; - # # You can also set the file content immediately. # ".gradle/gradle.properties".text = '' # org.gradle.console=verbose diff --git a/pkgs/default.nix b/pkgs/default.nix index afbe185..d4ec932 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,6 +9,7 @@ pkgs: [ darkcold-gtk-theme = pkgs.callPackage ./darkcold-gtk-theme.nix {}; arc-mono-gtk-theme = pkgs.callPackage ./arc-mono-gtk-theme.nix {}; vim-darcula-theme = pkgs.callPackage ./vim-darcula-theme.nix {}; + sddm-i3-theme = pkgs.callPackage ./sddm-i3-theme.nix {}; }) ] diff --git a/pkgs/sddm-i3-theme.nix b/pkgs/sddm-i3-theme.nix new file mode 100644 index 0000000..5feb4f7 --- /dev/null +++ b/pkgs/sddm-i3-theme.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchzip }: +stdenv.mkDerivation rec { + pname = "sddm-i3-theme"; + version = "1"; + + src = fetchzip { + url = "http://192.168.1.12/${pname}.tar.gz"; + hash = "sha256-WGvjW3Z8TfJhAsbxUyYRKSYFucEwYzTIbpDZsLTPbyo="; + }; + + installPhase = '' + mkdir -p $out/share/sddm/themes/${pname}/ + cp -r $src/* $out/share/sddm/themes/${pname}/ + ''; + + meta = { + license = lib.licenses.mit; + platforms = lib.platforms.linux; + }; +} diff --git a/programs/i3.nix b/programs/i3.nix index 3e8949d..0c8ba1d 100644 --- a/programs/i3.nix +++ b/programs/i3.nix @@ -54,7 +54,7 @@ }; startup = [ - { command = "picom &"; notification = false; } +# { command = "picom &"; notification = false; } { command = "mpd &"; notification = false; } { command = "dunst &"; notification = false; } { command = "flameshot &"; notification = false; } @@ -70,7 +70,7 @@ { command = "discord &"; notification = false; } { command = "element-desktop &"; notification = false; } - { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; } +# { command = "xrandr --output DP-3 --mode 1920x1080 --rate 239.76 --primary --output HDMI-3 --mode 1920x1080 --rate 74.97 --right-of DP-3 &"; notification = false; } ]; modes = let @@ -123,7 +123,7 @@ "${mod}+Shift+r" = "restart"; "${mod}+Shift+e" = "${execns} i3-nagbar -t warning -m 'exit?' -b 'yes' 'i3-msg exit'"; # Mouse bindings - "--border --whole-window button8" = "${execns} i3custom-window-actions"; + # "--border --whole-window button8" = "${execns} i3custom-window-actions"; "${mod}+Left" = cmd_and_center "focus left"; "${mod}+Right" = cmd_and_center "focus right"; diff --git a/programs/ssh.nix b/programs/ssh.nix index 668a9cc..23fe842 100644 --- a/programs/ssh.nix +++ b/programs/ssh.nix @@ -14,5 +14,12 @@ user = "forgejo"; identityFile = "~/.ssh/jacekgit"; }; + "zasadzka.pl" = { + user = "discord"; + identityFile = "~/.ssh/zasadzka"; + setEnv = { + "TERM" = "xterm-256color"; + }; + }; }; }