diff options
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | nixos/home.nix | 43 | ||||
| -rw-r--r-- | nixos/opt/nvidia.nix | 6 | ||||
| -rw-r--r-- | nixos/terminal_workspace/zellij.nix | 4 | ||||
| -rw-r--r-- | quickshell/shell.qml | 65 |
6 files changed, 45 insertions, 87 deletions
@@ -39,16 +39,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1765015431, - "narHash": "sha256-FQk/vnZvTU7Z/bYsebQMyICcvp43u9hrBKntSITXkhA=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "388b0c923d4d245cb6ac19eda4a7d93a32056592", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/master"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -51,8 +51,8 @@ zig = false; }; terminalworkspace = { - tmux = false; - zellij = true; + tmux = true; + zellij = false; }; # This is where I have keep the dotfiles folder, replace it accordingly diff --git a/nixos/home.nix b/nixos/home.nix index a18ac97..c0a7719 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, username, ... }: +{ config, pkgs, username, terminalworkspace, ... }: { users.users.${username} = { isNormalUser = true; @@ -19,18 +19,33 @@ function fish_prompt -d "Write out the prompt" printf '%s@%s %s%s%s > ' $USER $hostname \ (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) end +'' + (if terminalworkspace.tmux then '' +if status is-interactive + set fish_greeting -# if status is-interactive -# set fish_greeting -# -# if not set -q TMUX -# tmux new-session -d -s "main" -c "~/dev" -# if not set -q VSCODE_PID -# tmux -u a -# end -# end -# end + if not set -q TMUX + tmux new-session -d -s "main" -c "~/dev" + if not set -q VSCODE_PID + tmux -u a + end + end +end +'' else '''') + (if terminalworkspace.zellij then '' +if status is-interactive + set fish_greeting + + if status is-interactive + set fish_greeting + if not set -q ZELLIJ + if not set -q VSCODE_PID + cd ~/dev + zellij attach --create main + end + end +end +end +'' else '''') + '' function tsnode set filename (basename $argv[1] .ts) tsc $filename.ts @@ -53,6 +68,7 @@ alias find="fd" alias cloc="tokei" alias scrcpy="scrcpy --render-driver=opengl" alias wisdom="fortune ~/.config/fortune/showerthoughts | cowsay | lolcat" +alias search="rg --color=always --line-number --no-heading \"\" | fzf --ansi --phony --query \"\" --bind \"change:reload(rg --color=always --line-number --no-heading {q} || true)\"" function mkcd mkdir -p $argv[1] cd $argv[1] @@ -69,11 +85,8 @@ set -U fish_user_paths $HOME/.bin $fish_user_paths set ANDROID_NDK_HOME /opt/android-ndk set ANDROID_NDK_ROOT /opt/android-ndk set ANDROID_HOME /opt/android-sdk - ''; +''; }; - # programs.nushell = { - # enable = true; - # }; environment.systemPackages = with pkgs; [ nushell home-manager diff --git a/nixos/opt/nvidia.nix b/nixos/opt/nvidia.nix index 63db5b2..5bfe45e 100644 --- a/nixos/opt/nvidia.nix +++ b/nixos/opt/nvidia.nix @@ -5,8 +5,12 @@ modesetting.enable = true; package = config.boot.kernelPackages.nvidiaPackages.stable; nvidiaSettings = true; - open = true; + open = false; }; + hardware.graphics.enable32Bit = true; + hardware.graphics.extraPackages = with pkgs; [ + nvidia-vaapi-driver + ]; boot.kernelParams = [ "acpi_backlight=video" ]; boot.initrd.kernelModules = [ "nvidia" "hp_wmi" ]; services.xserver.videoDrivers = [ "nvidia" ]; diff --git a/nixos/terminal_workspace/zellij.nix b/nixos/terminal_workspace/zellij.nix index 549fe9f..be0c884 100644 --- a/nixos/terminal_workspace/zellij.nix +++ b/nixos/terminal_workspace/zellij.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, unstable, ... }: { environment.systemPackages = with pkgs; [ - zellij + unstable.zellij ]; } diff --git a/quickshell/shell.qml b/quickshell/shell.qml index 3219d09..0a6224d 100644 --- a/quickshell/shell.qml +++ b/quickshell/shell.qml @@ -69,7 +69,7 @@ ShellRoot { Component.onCompleted: running = false } - anchors.top: true + anchors.bottom: true anchors.left: true anchors.right: true implicitHeight: 32 @@ -92,65 +92,6 @@ ShellRoot { Latch {} Spin {} } - - // PanelWindow { - // id: apps - // - // anchors.top: true - // anchors.right: true - // anchors.bottom: true - // implicitWidth: 32 - // color: shellRoot.black - // - // ColumnLayout { - // Item {} - // IconButton { - // icon: "" - // tooltip: "Zen" - // onClicked: Quickshell.execDetached(["zen"]) - // } - // IconButton { - // icon: "" - // tooltip: "Dolphin" - // onClicked: Quickshell.execDetached(["dolphin"]) - // } - // IconButton { - // icon: "" - // tooltip: "Vscode" - // onClicked: Quickshell.execDetached(["code"]) - // } - // IconButton { - // icon: "" - // tooltip: "Localsend" - // onClicked: Quickshell.execDetached(["localsend_app"]) - // } - // IconButton { - // icon: "" - // tooltip: "Bitwarden" - // onClicked: Quickshell.execDetached(["bitwarden"]) - // } - // IconButton { - // icon: "" - // tooltip: "GIMP" - // onClicked: Quickshell.execDetached(["gimp"]) - // } - // IconButton { - // icon: "" - // tooltip: "Obsidian" - // onClicked: Quickshell.execDetached(["obsidian"]) - // } - // IconButton { - // icon: "" - // tooltip: "Discord" - // onClicked: Quickshell.execDetached(["discord"]) - // } - // IconButton { - // icon: "" - // tooltip: "VLC" - // onClicked: Quickshell.execDetached(["vlc"]) - // } - // } - // } } } Variants { @@ -165,7 +106,7 @@ ShellRoot { } margins { - top: Screen.height/2 - 300 + top: 5 left: Screen.width/2 - 200 } @@ -206,7 +147,7 @@ ShellRoot { margins { top: 5 - left: Screen.width - 435 - 40 + left: Screen.width - 435 - 5 } implicitWidth: 435 |